Merge branch 'sh-drop-golang-1.21-fips-workaround' into 'master'

Drop Go 1.21 FIPS workaround

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/735

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

.gitlab/ci/gitaly.images.yml

@@ -6,6 +6,8 @@
     - !reference [.build_dynamic_image, rules]
     - changes:
         - "scripts/lib/custom-docker-build"
+        - "scripts/install-git"
+        - "scripts/install-golang"
         - ".gitlab/ci/gitaly.images.yml"
 
 gitaly:

.gitlab/ci/gitlab.images.yml

@@ -6,9 +6,25 @@
   rules:
     - !reference [.build_dynamic_image, rules]
     - changes:
-        - "scripts/lib/custom-docker-build"
-        - ".gitlab/ci/gitlab.images.yml"
-        - "patches/ruby/**/*"
+      - "scripts/install-bazelisk"
+      - "scripts/install-chrome"
+      - "scripts/install-docker"
+      - "scripts/install-exiftool"
+      - "scripts/install-git"
+      - "scripts/install-gcloud"
+      - "scripts/install-golang"
+      - "scripts/install-graphicsmagick"
+      - "scripts/install-helm"
+      - "scripts/install-kubectl"
+      - "scripts/install-lfs"
+      - "scripts/install-node"
+      - "scripts/install-pcre2"
+      - "scripts/install-postgresql"
+      - "scripts/install-ruby"
+      - "scripts/install-rust"
+      - "scripts/lib/custom-docker-build"
+      - ".gitlab/ci/gitlab.images.yml"
+      - "patches/ruby/**/*"
 
 gitlab:
   extends:

scripts/install-golang

@@ -29,12 +29,7 @@ function build_ubi() {
         cd /usr/local/go/src
         PATH=$PATH:/tmp/golang/go/bin CGO_ENABLED=1 ./make.bash
     else
-        # This is a workaround until https://github.com/golang-fips/go/pull/107 is released.
-        if [[ $GO_MAJOR_VERSION == "1.21" ]]; then
-            GO_BRANCH="go1.20-fips-release"
-        else
-            GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release"
-        fi
+        GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release"
 
         git clone https://github.com/golang-fips/go.git --branch "${GO_BRANCH}" --single-branch --depth 1 /tmp/golang-fips
         cd /tmp/golang-fips