Merge branch 'master' into e2e-tests-on-published-chart

Author: MaciejKaras

.evergreen-functions.yml

@@ -515,16 +515,13 @@ functions:
     - command: subprocess.exec
       params:
         working_dir: src/github.com/mongodb/mongodb-kubernetes
-        binary: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/python/build_kubectl_plugin.py
-  
-  build_and_push_appdb_database:
+        binary: scripts/release/kubectl_mongodb/build_kubectl_plugin.sh
+
+  download_multi_cluster_binary:
     - command: subprocess.exec
       params:
-        working_dir: src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-appdb-database
-        binary: ./build_and_push_appdb_database_images.sh
-        add_to_path:
-          - ${workdir}/bin
-          - ${workdir}
+        working_dir: src/github.com/mongodb/mongodb-kubernetes
+        binary: scripts/release/kubectl_mongodb/download_kubectl_plugin.sh
 
   build_test_image_ibm:
     - command: subprocess.exec
@@ -801,22 +798,6 @@ functions:
         script: |
           ./scripts/code_snippets/tests/${task_name}
 
-  #
-  # kubectl mongodb plugin release functions
-  #
-  install_goreleaser:
-    - command: shell.exec
-      type: setup
-      include_expansions_in_env:
-        - goreleaser_pro_tar_gz
-      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
-          sudo cp goreleaser /usr/local/bin/
-
   install_macos_notarization_service:
     - command: shell.exec
       type: setup
@@ -851,7 +832,7 @@ functions:
     - command: github.generate_token
       params:
         expansion_name: GH_TOKEN
-    - command: shell.exec
+    - command: subprocess.exec
       type: setup
       params:
         working_dir: src/github.com/mongodb/mongodb-kubernetes
@@ -868,10 +849,7 @@ functions:
           - triggered_by_git_tag
           - OPERATOR_VERSION
         env:
-          XDG_CONFIG_HOME: ${go_base_path}${workdir}
-          GO111MODULE: "on"
-          GOROOT: "/opt/golang/go1.24"
           MACOS_NOTARY_KEY: ${macos_notary_keyid}
           MACOS_NOTARY_SECRET: ${macos_notary_secret}
           GH_TOKEN: ${GH_TOKEN}
-        script: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/python/promote_kubectl_plugin.py
+        binary: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/promote_kubectl_plugin.py

.evergreen-release.yml

@@ -9,7 +9,7 @@ tasks:
     commands:
       - func: clone
       - func: setup_building_host
-      - func: build_multi_cluster_binary
+      - func: download_multi_cluster_binary
       - func: pipeline
         vars:
           image_name: meko-tests
@@ -123,9 +123,8 @@ tasks:
     tags: [ "binary_release" ]
     commands:
       - func: clone
-      - func: install_goreleaser
-      - func: install_macos_notarization_service
       - func: python_venv
+      - func: install_macos_notarization_service
       - func: release_kubectl_mongodb_plugin
 
   - name: create_chart_release_pr
@@ -134,7 +133,7 @@ tasks:
       - func: clone
       - func: python_venv
       - func: create_chart_release_pr
-  
+
   - name: release_chart_to_oci_registry
     tags: [ "release_chart_to_oci_registry" ]
     commands:
@@ -224,6 +223,9 @@ buildvariants:
     allowed_requesters: [ "patch", "github_tag" ]
     run_on:
       - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
+    depends_on:
+      - name: release_kubectl_mongodb_plugin
+        variant: release_kubectl_mongodb_plugin
     tasks:
       - name: build_test_image_for_smoke_tests
 
@@ -250,6 +252,8 @@ buildvariants:
     depends_on:
       - name: "*"
         variant: release_images
+      - name: "*"
+        variant: init_smoke_tests
     tasks:
       - name: e2e_smoke_task_group
 

.evergreen-snippets.yml

@@ -7,7 +7,7 @@ variables:
       - func: setup_mongosh
       - func: download_kube_tools
       - func: switch_context
-      - func: build_multi_cluster_binary
+      - func: download_multi_cluster_binary
     teardown_task:
       - func: upload_e2e_logs
       - func: upload_code_snippets_logs

.evergreen.yml

@@ -86,8 +86,6 @@ variables:
       - func: clone
       - func: switch_context
       - func: setup_building_host_minikube
-      - func: install_goreleaser
-      - func: build_multi_cluster_binary
 
   - &setup_group_multi_cluster
     setup_group_can_fail_task: true
@@ -96,8 +94,6 @@ variables:
       - func: download_kube_tools
       - func: switch_context
       - func: setup_building_host
-      - func: install_goreleaser
-      - func: build_multi_cluster_binary
 
   - &setup_and_teardown_task_cloudqa
     setup_task_can_fail_task: true
@@ -352,12 +348,17 @@ tasks:
           image_name: agent
           flags: "--parallel --current-agents --skip-if-exists=false"
 
-  - name: build_test_image
+  - name: build_kubectl_mongodb_plugin
     commands:
       - func: clone
       - func: setup_building_host
-      - func: install_goreleaser
       - func: build_multi_cluster_binary
+
+  - name: build_test_image
+    commands:
+      - func: clone
+      - func: setup_building_host
+      - func: download_multi_cluster_binary
       - func: pipeline
         vars:
           image_name: meko-tests
@@ -366,8 +367,7 @@ tasks:
     commands:
       - func: clone
       - func: setup_building_host
-      - func: install_goreleaser
-      - func: build_multi_cluster_binary
+      - func: download_multi_cluster_binary
       - func: pipeline
         vars:
           image_name: meko-tests-arm64
@@ -384,8 +384,7 @@ tasks:
           add_to_path:
             - ${workdir}/bin
           command: scripts/evergreen/setup_minikube_host.sh
-      - func: install_goreleaser
-      - func: build_multi_cluster_binary
+      - func: download_multi_cluster_binary
       - func: build_test_image_ibm
 
   - name: build_mco_test_image
@@ -1510,9 +1509,6 @@ buildvariants:
         variant: init_test_run
       - name: build_test_image_arm
         variant: init_test_run_arm
-    # TODO: Re-enable when staging is added to pipeline
-    # https://jira.mongodb.org/browse/CLOUDP-349096
-    disable: true
     tasks:
       - name: e2e_smoke_arm_task_group
 
@@ -1529,9 +1525,6 @@ buildvariants:
         variant: init_test_run
       - name: build_test_image_arm
         variant: init_test_run_arm
-    # TODO: Re-enable when staging is added to pipeline
-    # https://jira.mongodb.org/browse/CLOUDP-349096
-    disable: true
     tasks:
       - name: e2e_smoke_arm_task_group
 
@@ -1727,6 +1720,8 @@ buildvariants:
       - name: build_operator_ubi
       - name: build_operator_race_ubi
       - name: build_test_image
+        depends_on:
+          - name: build_kubectl_mongodb_plugin
       - name: build_mco_test_image
       - name: build_init_appdb_images_ubi
       - name: build_init_om_images_ubi
@@ -1735,6 +1730,7 @@ buildvariants:
       - name: build_agent_images_ubi
       - name: build_readiness_probe_image
       - name: build_version_upgrade_hook_image
+      - name: build_kubectl_mongodb_plugin
       - name: prepare_aws
       - name: publish_helm_chart
 
@@ -1748,6 +1744,9 @@ buildvariants:
     run_on:
       - rhel9-power-small
       - rhel9-power-large
+    depends_on:
+      - name: build_kubectl_mongodb_plugin
+        variant: init_test_run
     tasks:
       - name: build_test_image_ibm
 
@@ -1761,6 +1760,9 @@ buildvariants:
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
+    depends_on:
+      - name: build_kubectl_mongodb_plugin
+        variant: init_test_run
     tasks:
       - name: build_test_image_ibm
 
@@ -1770,6 +1772,9 @@ buildvariants:
     tags: [ "staging" ]
     run_on:
       - ubuntu2204-arm64-small
+    depends_on:
+      - name: build_kubectl_mongodb_plugin
+        variant: init_test_run
     tasks:
       - name: build_test_image_arm
 

.gitignore

@@ -89,8 +89,6 @@ logs-debug/
 docs/**/log/*
 docs/**/test.sh.run.log
 
-# goreleaser generated files
-dist
 logs
 *.run.log
 

.goreleaser.yaml

@@ -159,7 +159,7 @@ build-and-push-operator-image: aws_login
 build-and-push-database-image: aws_login
 	@ scripts/dev/build_push_database_image
 
-build-and-push-test-image: aws_login build-multi-cluster-binary
+build-and-push-test-image: aws_login
 	@ if [[ -z "$(local)" ]]; then \
 		scripts/dev/run_python.sh scripts/release/pipeline.py test; \
 	fi
@@ -169,9 +169,6 @@ build-and-push-mco-test-image: aws_login
 		scripts/dev/run_python.sh scripts/release/pipeline.py mco-test; \
 	fi
 
-build-multi-cluster-binary:
-	scripts/evergreen/build_multi_cluster_kubeconfig_creator.sh
-
 # builds all app images in parallel
 # note that we cannot build both appdb and database init images in parallel as they change the same docker file
 build-and-push-images: build-and-push-operator-image appdb-init-image om-init-image database operator-image database-init-image

Makefile

@@ -356,13 +356,14 @@
         ]
       },
       "staging": {
-        "sign": false,
         "s3-store": "mongodb-kubernetes-staging",
         "platforms": [
           "darwin/amd64",
           "darwin/arm64",
           "linux/amd64",
-          "linux/arm64"
+          "linux/arm64",
+          "linux/s390x",
+          "linux/ppc64le"
         ]
       },
       "release": {
@@ -372,7 +373,9 @@
           "darwin/amd64",
           "darwin/arm64",
           "linux/amd64",
-          "linux/arm64"
+          "linux/arm64",
+          "linux/s390x",
+          "linux/ppc64le"
         ]
       }
     }