Re apply 1.25 fixes

.evergreen.yml

@@ -2,9 +2,8 @@ variables:
   - &go_env
     XDG_CONFIG_HOME: ${go_base_path}${workdir}
     GO111MODULE: "on"
-    GOROOT: "/opt/golang/go1.22"
+    GOROOT: "/opt/golang/go1.21"
 functions:
-
   "clone":
     - command: subprocess.exec
       type: setup
@@ -23,7 +22,7 @@ functions:
       params:
         script: |
           set -Eeu pipefail
-          
+
           curl -fL "${goreleaser_pro_tar_gz}" --output goreleaser_Linux_x86_64.tar.gz
           tar -xf goreleaser_Linux_x86_64.tar.gz
           chmod 755 ./goreleaser
@@ -36,7 +35,7 @@ functions:
           - notary_service_url
         script: |
           set -Eeu pipefail
-          
+
           curl "${notary_service_url}" --output macos-notary.zip
           unzip -u macos-notary.zip
           chmod 755 ./linux_amd64/macnotary
@@ -47,6 +46,12 @@ functions:
         working_dir: src/github.com/mongodb/mongodb-enterprise-kubernetes/tools/multicluster
         include_expansions_in_env:
           - GITHUB_TOKEN
+          - GRS_USERNAME
+          - GRS_PASSWORD
+          - PKCS11_URI
+          - ARTIFACTORY_URL
+          - ARTIFACTORY_PASSWORD
+          - SIGNING_IMAGE_URI
           - macos_notary_keyid
           - macos_notary_secret
           - workdir
@@ -74,14 +79,10 @@ tasks:
       - func: "release"
 
 buildvariants:
-
-# This variant is kept manual for now in order avoid any interfering with the existing release process.
-# In the future, it will be called in one of two ways:
-# By PCT when a new operator version is released.
-# When a new tag is out similarly to github actions.
-- name: release_mcli
-  display_name: Release Go multi-cluster binary
-  run_on:
-    - ubuntu2204-small
-  tasks:
-    - name: package_goreleaser
+  # This variant is run when a new tag is out similar to github actions.
+  - name: release_mcli
+    display_name: Release Go multi-cluster binary
+    run_on:
+      - ubuntu2204-small
+    tasks:
+      - name: package_goreleaser

.github/workflows/release-multicluster-cli.yaml

@@ -1,28 +0,0 @@
-name: Release multicluster-cli binary
-on:
-  push:
-    tags:
-      - '*'
-  workflow_dispatch:
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.21'
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
-        with:
-          distribution: goreleaser
-          version: latest
-          args: release --rm-dist
-          workdir: ./tools/multicluster
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GORELEASER_CURRENT_TAG: ${{ github.ref_name }}

.gitignore

@@ -1,4 +1,4 @@
 .idea
 *.iml
 .DS_Store
-tools/multicluster/linux_amd64/*
+tools/multicluster/linux_amd64/*