Merge branch '212643-add-commit-annotation-to-webservice-and-sidekiq' into 'master'

Resolve "Review app deployment is not pulling latest image"

Closes #212643

See merge request gitlab-org/gitlab!31336

.gitlab/ci/review.gitlab-ci.yml

@@ -53,7 +53,7 @@ review-build-cng:
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
-    GITLAB_HELM_CHART_REF: "v3.2.2"
+    GITLAB_HELM_CHART_REF: "v3.3.3"
   environment:
     name: review/${CI_COMMIT_REF_NAME}
     url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}

scripts/review_apps/review-apps.sh

@@ -272,8 +272,10 @@ HELM_CMD=$(cat << EOF
     --set gitlab.gitaly.image.tag="v${GITALY_VERSION}" \
     --set gitlab.gitlab-shell.image.repository="${gitlab_shell_image_repository}" \
     --set gitlab.gitlab-shell.image.tag="v${GITLAB_SHELL_VERSION}" \
+    --set gitlab.sidekiq.annotations.commit="${CI_COMMIT_SHORT_SHA}" \
     --set gitlab.sidekiq.image.repository="${gitlab_sidekiq_image_repository}" \
     --set gitlab.sidekiq.image.tag="${CI_COMMIT_REF_SLUG}" \
+    --set gitlab.unicorn.annotations.commit="${CI_COMMIT_SHORT_SHA}" \
     --set gitlab.unicorn.image.repository="${gitlab_unicorn_image_repository}" \
     --set gitlab.unicorn.image.tag="${CI_COMMIT_REF_SLUG}" \
     --set gitlab.unicorn.workhorse.image="${gitlab_workhorse_image_repository}" \