Merge branch 'multi-arch-pipeline-combined' of github.com:mongodb/mongodb-kubernetes into multi-arch-pipeline-combined

Author: nammn

.evergreen-functions.yml

@@ -543,15 +543,6 @@ functions:
 
   pipeline:
     - *switch_context
-    - command: shell.exec
-      type: setup
-      params:
-        shell: bash
-        script: |
-          # Docker Hub workaround
-          # docker buildx needs the moby/buildkit image when setting up a builder so we pull it from our mirror
-          docker buildx create --driver=docker-container --driver-opt=image=268558157000.dkr.ecr.eu-west-1.amazonaws.com/docker-hub-mirrors/moby/buildkit:buildx-stable-1 --use
-          docker buildx inspect --bootstrap
     - command: subprocess.exec
       retry_on_failure: true
       type: setup

.evergreen.yml

@@ -1466,7 +1466,7 @@ buildvariants:
     run_on:
       - rhel9-power-small
       - rhel9-power-large
-    allowed_requesters: [ "github_tag" ]
+    allowed_requesters: [ "patch", "github_tag" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1489,7 +1489,7 @@ buildvariants:
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
-    allowed_requesters: [ "github_tag" ]
+    allowed_requesters: [ "patch", "github_tag" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run

build_info.json

@@ -4,8 +4,8 @@
       "dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
-         "platforms": [
-          "linux/amd64"
+        "platforms": [
+           "linux/amd64"
         ]
       },
       "staging": {
@@ -49,7 +49,7 @@
       "dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database"],
-         "platforms": [
+        "platforms": [
            "linux/amd64"
          ]
       },
@@ -78,7 +78,7 @@
       "dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb"],
-         "platforms": [
+        "platforms": [
           "linux/amd64"
         ]
       },
@@ -107,7 +107,7 @@
       "dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager"],
-         "platforms": [
+        "platforms": [
           "linux/amd64"
         ]
       },
@@ -130,8 +130,8 @@
       "dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database"],
-         "platforms": [
-          "linux/amd64"
+        "platforms": [
+           "linux/amd64"
         ]
       },
       "staging": {
@@ -190,7 +190,7 @@
       "dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe"],
-         "platforms": [
+        "platforms": [
           "linux/amd64"
         ]
       },
@@ -218,7 +218,7 @@
       "dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
-         "platforms": [
+        "platforms": [
           "linux/amd64"
         ]
       },
@@ -244,8 +244,8 @@
       "dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
       "patch": {
         "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
-         "platforms": [
-          "linux/amd64"
+        "platforms": [
+           "linux/amd64"
         ]
       },
       "staging": {

docker/mongodb-agent/Dockerfile.atomic

@@ -55,7 +55,11 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal
 
 # Replace libcurl-minimal and curl-minimal with the full versions
 # https://bugzilla.redhat.com/show_bug.cgi?id=1994521
-RUN  microdnf install -y libssh libpsl libbrotli
+RUN  microdnf install -y libssh libpsl libbrotli \
+    && microdnf download curl libcurl \
+    && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \
+    && microdnf remove -y libcurl-minimal curl-minimal
+
 RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
 # Copy-pasted from https://www.mongodb.com/docs/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/
 RUN microdnf install -y --disableplugin=subscription-manager \

docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic

@@ -1,9 +1,12 @@
-FROM public.ecr.aws/docker/library/golang:1.24 AS base
+FROM --platform=${BUILDPLATFORM} public.ecr.aws/docker/library/golang:1.24 AS base
 
 WORKDIR /go/src
 ADD ./docker/mongodb-kubernetes-init-ops-manager .
-RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/mmsconfiguration ./mmsconfiguration
-RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/backup-daemon-readiness-probe ./backupdaemon_readinessprobe/
+
+ARG TARGETOS
+ARG TARGETARCH
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -buildvcs=false -o /data/scripts/mmsconfiguration ./mmsconfiguration
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -buildvcs=false -o /data/scripts/backup-daemon-readiness-probe ./backupdaemon_readinessprobe/
 
 COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh /data/scripts/
 COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts/

scripts/dev/contexts/e2e_smoke_arm

@@ -14,6 +14,6 @@ export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
 CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${script_dir}"/../../../.evergreen.yml | awk '{print $3}')
 export CUSTOM_OM_VERSION
 
-export CUSTOM_MDB_VERSION=6.0.5-ent
+export CUSTOM_MDB_VERSION=8.0.12-ent
 export KUBE_ENVIRONMENT_NAME=kind
 export CLUSTER_TYPE=kind

scripts/dev/contexts/e2e_static_smoke_ibm_power

@@ -13,5 +13,5 @@ export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
 CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${script_dir}"/../../../.evergreen.yml | awk '{print $3}')
 export CUSTOM_OM_VERSION
 export MDB_DEFAULT_ARCHITECTURE=static
-# MDB doesn't support power for 7.x.x on RHEL9
-export CUSTOM_MDB_VERSION=8.0.12
+# MDB supports ppc64le on RHEL9 only from 8.0.12 onwards
+export CUSTOM_MDB_VERSION=8.0.12-ent

scripts/dev/contexts/e2e_static_smoke_ibm_z

@@ -13,5 +13,5 @@ export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
 CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${script_dir}"/../../../.evergreen.yml | awk '{print $3}')
 export CUSTOM_OM_VERSION
 export MDB_DEFAULT_ARCHITECTURE=static
-# MDB doesn't fully support s390x for 7.x.x on RHEL9
-export CUSTOM_MDB_VERSION=8.0.12
+# MDB supports s390x on RHEL9 only from 8.0.12 onwards
+export CUSTOM_MDB_VERSION=8.0.12-ent

scripts/dev/contexts/variables/e2e_ibm_smoke_base

@@ -4,8 +4,7 @@ set -Eeou pipefail
 
 export ops_manager_version="cloud_qa"
 
-export CUSTOM_MDB_VERSION=7.0.22 # we only have ibm static images starting with 7.0.22
+export CUSTOM_MDB_VERSION=7.0.22-ent # we only have ibm static images starting with 7.0.22
 export KUBE_ENVIRONMENT_NAME=minikube
 export CLUSTER_TYPE=minikube
 export CONTAINER_RUNTIME=podman
-

scripts/evergreen/build_multi_cluster_kubeconfig_creator.sh

@@ -10,28 +10,31 @@ OS=${OS:-$(uname -s | tr '[:upper:]' '[:lower:]')}
 ARCH=${ARCH:-$(uname -m | tr '[:upper:]' '[:lower:]')}
 if [[ "${ARCH}" == "x86_64" ]]; then
   ARCH="amd64"
+elif [[ "${ARCH}" == "aarch64" ]]; then
+  ARCH="arm64"
 fi
 
 echo "Building multi cluster kube config creation tool."
 
 project_dir="$(pwd)"
 pushd cmd/kubectl-mongodb
-GOOS="${OS}" GOARCH="${ARCH}" CGO_ENABLED=0 go build -buildvcs=false -o "${project_dir}/docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator" main.go &
+go mod download
 
 GOOS="linux" GOARCH="amd64" CGO_ENABLED=0 go build -buildvcs=false -o "${project_dir}/docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_amd64" main.go &
 GOOS="linux" GOARCH="s390x" CGO_ENABLED=0 go build -buildvcs=false -o "${project_dir}/docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_s390x" main.go &
 GOOS="linux" GOARCH="ppc64le" CGO_ENABLED=0 go build -buildvcs=false -o "${project_dir}/docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_ppc64le" main.go &
 GOOS="linux" GOARCH="arm64" CGO_ENABLED=0 go build -buildvcs=false -o "${project_dir}/docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_arm64" main.go &
 wait
 popd
-chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator
 
 # these are used in the dockerfile
 chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_amd64
 chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_s390x
 chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_ppc64le
 chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_arm64
 
+cp docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_${ARCH} docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator || true
+
 mkdir -p bin || true
 cp docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator bin/kubectl-mongodb || true
 cp bin/kubectl-mongodb "${WORKDIR}/bin/kubectl-mongodb" || true