Add latest changes from gitlab-org/gitlab@master

6 files changed, 21 insertions, 14 deletions

diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index e013f9475d8..ab98bab022e 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -209,7 +209,7 @@ variables:
       - "production"
       - "staging"
       - "canary"
-    description: "The deployment target. Set to 'production' by default."
+    description: "The deployment target. Set to 'staging' by default."
 ```
 
 ### Run a pipeline by using a URL query string
diff --git a/doc/development/sidekiq/compatibility_across_updates.md b/doc/development/sidekiq/compatibility_across_updates.md
index c9759a1c95f..b417a099228 100644
--- a/doc/development/sidekiq/compatibility_across_updates.md
+++ b/doc/development/sidekiq/compatibility_across_updates.md
@@ -158,7 +158,10 @@ To remove a worker class, follow these steps over two minor releases:
 
     By implementing this no-op, you can avoid unnecessary cycles once any deprecated jobs that are still enqueued eventually get processed.
 
-1. In a separate merge request, because it's a migration, consider using the `sidekiq_remove_jobs` helper migration method in a **post-deployment migration**:
+### In a subsequent, separate minor release
+
+1. Delete the worker class file and follow the guidance in our [Sidekiq queues documentation](../sidekiq/index.md#sidekiq-queues) around running Rake tasks to regenerate/update related files.
+1. Add a migration (not a post-deployment migration) that uses `sidekiq_remove_jobs`:
 
     ```ruby
     class RemoveMyDeprecatedWorkersJobInstances < Gitlab::Database::Migration[2.0]
@@ -177,10 +180,6 @@ To remove a worker class, follow these steps over two minor releases:
     end
     ```
 
-#### In a subsequent, separate minor release
-
-1. Delete the worker class file and follow the guidance in our [Sidekiq queues documentation](../sidekiq/index.md#sidekiq-queues) around running Rake tasks to regenerate/update related files.
-
 ## Renaming queues
 
 For the same reasons that removing workers is dangerous, care should be taken
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index a60e80d6196..8a4843b9843 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -53,7 +53,6 @@ GitLab.com uses the SAML NameID to identify users. The NameID element:
   also case-insensitive, which can result in users being unable to sign in.
 
 The relevant field name and recommended value for supported providers are in the [provider specific notes](#providers).
-appropriate corresponding field.
 
 WARNING:
 Once users have signed into GitLab using the SSO SAML setup, changing the `NameID` breaks the configuration and potentially locks users out of the GitLab group.
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh
index a108fb8df69..fea77876b66 100755
--- a/scripts/review_apps/review-apps.sh
+++ b/scripts/review_apps/review-apps.sh
@@ -372,15 +372,24 @@ function verify_deploy() {
 function display_deployment_debug() {
   local namespace="${CI_ENVIRONMENT_SLUG}"
 
+  # Install dig to inspect DNS entries
+  apt update && apt install dnsutils
+
+  echoinfo "[debugging data] Check review-app webservice DNS entry:"
+  dig +short $(echo "${CI_ENVIRONMENT_URL}" | sed 's~http[s]*://~~g')
+
+  echoinfo "[debugging data] Check external IP for nginx-ingress-controller service (should be THE SAME AS the DNS entry IP above):"
+  kubectl -n "${namespace}" get svc "${namespace}-nginx-ingress-controller" -o jsonpath='{.status.loadBalancer.ingress[].ip}'
+
   echoinfo "[debugging data] k8s resources:"
-  kubectl get pods --namespace "${namespace}"
+  kubectl -n "${namespace}" get pods
 
   echoinfo "[debugging data] PostgreSQL logs:"
-  kubectl logs -l app=postgresql --all-containers --namespace "${namespace}"
+  kubectl -n "${namespace}" logs -l app=postgresql --all-containers
 
   echoinfo "[debugging data] DB migrations logs:"
-  kubectl logs -l app=migrations --all-containers --namespace "${namespace}"
+  kubectl -n "${namespace}" logs -l app=migrations --all-containers
 
   echoinfo "[debugging data] Webservice logs:"
-  kubectl logs -l app=webservice -c webservice --namespace "${namespace}"
+  kubectl -n "${namespace}" logs -l app=webservice -c webservice
 }
diff --git a/workhorse/go.mod b/workhorse/go.mod
index e15a8c01e5e..05e1e52a605 100644
--- a/workhorse/go.mod
+++ b/workhorse/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/BurntSushi/toml v1.2.1
 	github.com/FZambia/sentinel v1.1.1
 	github.com/alecthomas/chroma/v2 v2.4.0
-	github.com/aws/aws-sdk-go v1.44.152
+	github.com/aws/aws-sdk-go v1.44.157
 	github.com/disintegration/imaging v1.6.2
 	github.com/getsentry/raven-go v0.2.0
 	github.com/golang-jwt/jwt/v4 v4.4.3
diff --git a/workhorse/go.sum b/workhorse/go.sum
index 2b3c111912c..65c3f6485eb 100644
--- a/workhorse/go.sum
+++ b/workhorse/go.sum
@@ -228,8 +228,8 @@ github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.45/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.68/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.44.152 h1:L9aaepO8wHB67gwuGD8VgIYH/cmQDxieCt7FeLa0+fI=
-github.com/aws/aws-sdk-go v1.44.152/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.157 h1:JVBPpEWC8+yA7CbfAuTl/ZFFlHS3yoqWFqxFyTCISwg=
+github.com/aws/aws-sdk-go v1.44.157/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/aws/aws-sdk-go-v2 v1.16.8 h1:gOe9UPR98XSf7oEJCcojYg+N2/jCRm4DdeIsP85pIyQ=
 github.com/aws/aws-sdk-go-v2 v1.16.8/go.mod h1:6CpKuLXg2w7If3ABZCl/qZ6rEgwtjZTn4eAf4RcEyuw=