CLOUDP-339609 - migrate repo from mongodb/mongodb-agent-ubi to mongodb/mongodb-agent

build_info.json

@@ -243,14 +243,14 @@
     "agent": {
       "dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
       "patch": {
-        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
+        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent"],
         "platforms": [
            "linux/amd64"
         ]
       },
       "staging": {
         "sign": true,
-        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
+        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent"],
         "platforms": [
           "linux/arm64",
           "linux/amd64",

changelog/20250826_feature_migrate_agent_repo.md

@@ -0,0 +1,10 @@
+---
+title: migrate agent repo
+kind: feature
+date: 2025-08-26
+---
+
+* MongoDB Agent images have been migrated to new container repository: `quay.io/mongodb/mongodb-agent`.
+  * the agents in the new repository will support the x86-64, ARM64, s390x, and ppc64le architectures. More can be read in the [public docs](https://www.mongodb.com/docs/kubernetes/upcoming/tutorial/plan-k8s-op-container-images/).
+  * operator running >=MCK1.3.0 and static cannot use the agent images from the old container repository `quay.io/mongodb/mongodb-agent-ubi`.
+* `quay.io/mongodb/mongodb-agent-ubi` should not be used anymore, it's only there for backwards compatibility.

config/manager/manager.yaml

@@ -87,9 +87,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -110,7 +110,7 @@ spec:
               value: mongodb-kubernetes-operator
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
@@ -131,37 +131,35 @@ spec:
             - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
               value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.12.8669-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.13.8702-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.15.8741-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.17.8771-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.0.8694-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.1.8718-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.11.8830-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.12.8846-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.3.8758-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.4.8770-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.6.8796-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.7.8810-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
+              value: "quay.io/mongodb/mongodb-agent:12.0.35.7911-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_13_38_0_9654_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.38.0.9654-1"
+              value: "quay.io/mongodb/mongodb-agent:13.38.0.9654-1"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27

controllers/operator/appdbreplicaset_controller.go

@@ -594,7 +594,7 @@ func (r *ReconcileAppDbReplicaSet) ReconcileAppDB(ctx context.Context, opsManage
 
 		appdbOpts.LegacyMonitoringAgentImage = images.ContainerImage(r.imageUrls, mcoConstruct.AgentImageEnv, legacyMonitoringAgentVersion)
 
-		// AgentImageEnv contains the full container image uri e.g. quay.io/mongodb/mongodb-agent-ubi:107.0.0.8502-1
+		// AgentImageEnv contains the full container image uri e.g. quay.io/mongodb/mongodb-agent:107.0.0.8502-1
 		// In non-static containers we don't ask OM for the correct version, therefore we just rely on the provided
 		// environment variable.
 		appdbOpts.AgentImage = r.imageUrls[mcoConstruct.AgentImageEnv]

controllers/operator/appdbreplicaset_controller_test.go

@@ -442,15 +442,15 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 				Containers: []corev1.Container{
 					{
 						Name:  "mongodb-agent",
-						Image: "quay.io/mongodb/mongodb-agent-ubi:10",
+						Image: "quay.io/mongodb/mongodb-agent:10",
 					},
 					{
 						Name:  "mongod",
 						Image: "quay.io/mongodb/mongodb:10",
 					},
 					{
 						Name:  "mongodb-agent-monitoring",
-						Image: "quay.io/mongodb/mongodb-agent-ubi:20",
+						Image: "quay.io/mongodb/mongodb-agent:20",
 					},
 				},
 			},
@@ -466,15 +466,15 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 		foundImages := 0
 		for _, c := range appDbSts.Spec.Template.Spec.Containers {
 			if c.Name == "mongodb-agent" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:10", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:10", c.Image)
 				foundImages += 1
 			}
 			if c.Name == "mongod" {
 				assert.Equal(t, "quay.io/mongodb/mongodb:10", c.Image)
 				foundImages += 1
 			}
 			if c.Name == "mongodb-agent-monitoring" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:20", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:20", c.Image)
 				foundImages += 1
 			}
 		}
@@ -492,15 +492,15 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 		foundImages := 0
 		for _, c := range appDbSts.Spec.Template.Spec.Containers {
 			if c.Name == "mongodb-agent" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:10", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:10", c.Image)
 				foundImages += 1
 			}
 			if c.Name == "mongod" {
 				assert.Equal(t, "quay.io/mongodb/mongodb:10", c.Image)
 				foundImages += 1
 			}
 			if c.Name == "mongodb-agent-monitoring" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:20", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:20", c.Image)
 				foundImages += 1
 			}
 		}

controllers/operator/mongodbmultireplicaset_controller_test.go

@@ -138,7 +138,7 @@ func TestMultiReplicaSetClusterReconcileContainerImagesWithStaticArchitecture(t
 	databaseRelatedImageEnv := fmt.Sprintf("RELATED_IMAGE_%s_8_0_0_ubi9", mcoConstruct.MongodbImageEnv)
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}

controllers/operator/mongodbopsmanager_controller_test.go

@@ -551,7 +551,7 @@ func TestOpsManagerReconcileContainerImagesWithStaticArchitecture(t *testing.T)
 
 		// AppDB images
 		mongodbRelatedImageEnv:          "quay.io/mongodb/mongodb-enterprise-appdb-database-ubi@sha256:MONGODB_SHA",
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 	}
 
 	ctx := context.Background()

controllers/operator/mongodbreplicaset_controller_test.go

@@ -129,7 +129,7 @@ func TestReplicaSetClusterReconcileContainerImagesWithStaticArchitecture(t *test
 	databaseRelatedImageEnv := fmt.Sprintf("RELATED_IMAGE_%s_8_0_0_ubi9", mcoConstruct.MongodbImageEnv)
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}
@@ -157,7 +157,7 @@ func TestReplicaSetClusterReconcileContainerImagesWithStaticArchitecture(t *test
 func VerifyStaticContainers(t *testing.T, containers []corev1.Container) {
 	agentContainerImage := findContainerImage(containers, util.AgentContainerName)
 	require.NotNil(t, agentContainerImage, "Agent container not found")
-	assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:12.0.30.7791-1", agentContainerImage)
+	assert.Equal(t, "quay.io/mongodb/mongodb-agent:12.0.30.7791-1", agentContainerImage)
 
 	mongoContainerImage := findContainerImage(containers, util.DatabaseContainerName)
 	require.NotNil(t, mongoContainerImage, "MongoDB container not found")

controllers/operator/mongodbshardedcluster_controller_test.go

@@ -294,7 +294,7 @@ func TestShardedClusterReconcileContainerImagesWithStaticArchitecture(t *testing
 	sc := test.DefaultClusterBuilder().SetVersion("8.0.0").SetShardCountSpec(1).Build()
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}

controllers/operator/mongodbstandalone_controller_test.go

@@ -109,7 +109,7 @@ func TestStandaloneClusterReconcileContainerImagesWithStaticArchitecture(t *test
 	databaseRelatedImageEnv := fmt.Sprintf("RELATED_IMAGE_%s_8_0_0_ubi9", mcoConstruct.MongodbImageEnv)
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}

docker/mongodb-agent/Dockerfile.atomic

@@ -20,8 +20,11 @@ RUN case ${TARGETPLATFORM} in \
     && mkdir -p /tools \
     && curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"
 
-RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
-    && rm /tools/mongodb_tools.tgz
+RUN tar xfz /tools/mongodb_tools.tgz \
+    && mv mongodb-database-tools-*/bin/* /tools \
+    && chmod +x /tools/* \
+    && rm /tools/mongodb_tools.tgz \
+    && rm -r mongodb-database-tools-*
 
 FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS agent_downloader
 

docker/mongodb-agent/README.md

@@ -8,13 +8,31 @@ binaries from there. Then we continue with the other steps to fully build the im
 For building the MongoDB Agent image locally use the example command:
 
 ```bash
-VERSION="108.0.7.8810-1"
-INIT_DATABASE_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database:1.1.0"
-MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
-MONGODB_AGENT_URL_UBI="https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-108.0.7.8810-1.rhel9_x86_64.tar.gz"
-docker buildx build --load --progress plain . -f docker/mongodb-agent/Dockerfile -t "mongodb-agent:${VERSION}_1.1.0" \
- --build-arg version="${VERSION}" \
- --build-arg init_database_image="${INIT_DATABASE_IMAGE}" \
- --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}" \
- --build-arg mongodb_agent_url_ubi="${MONGODB_AGENT_URL_UBI}"
+VERSION="evergreen"
+AGENT_VERSION="108.0.7.8810-1"
+TOOLS_VERSION="100.12.0"
+MONGODB_TOOLS_URL="https://downloads.mongodb.org/tools/db"
+MONGODB_AGENT_URL="https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod"
+BASE_REPO_URL="268558157000.dkr.ecr.us-east-1.amazonaws.com/lucian.tosa/"
+INIT_DATABASE_IMAGE="${BASE_REPO_URL}mongodb-kubernetes-init-database:${VERSION}"
+MONGODB_AGENT_BASE="mongodb-mms-automation-agent"
+MONGODB_DATABASE_TOOLS_BASE="mongodb-database-tools"
+
+
+docker buildx build --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-agent/Dockerfile -t "${BASE_REPO_URL}mongodb-agent:${AGENT_VERSION}_${VERSION}" \
+    --build-arg version="${VERSION}" \
+    --build-arg init_database_image="${INIT_DATABASE_IMAGE}" \
+    --build-arg mongodb_tools_url="${MONGODB_TOOLS_URL}" \
+    --build-arg mongodb_agent_url="${MONGODB_AGENT_URL}" \
+    --build-arg mongodb_agent_version_s390x="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.rhel7_s390x.tar.gz" \
+    --build-arg mongodb_agent_version_ppc64le="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.rhel8_ppc64le.tar.gz" \
+    --build-arg mongodb_agent_version_amd64="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.linux_x86_64.tar.gz" \
+    --build-arg mongodb_agent_version_arm64="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.amzn2_aarch64.tar.gz" \
+    --build-arg mongodb_tools_version_arm64="${MONGODB_DATABASE_TOOLS_BASE}-rhel93-aarch64-${TOOLS_VERSION}.tgz" \
+    --build-arg mongodb_tools_version_amd64="${MONGODB_DATABASE_TOOLS_BASE}-rhel93-x86_64-${TOOLS_VERSION}.tgz" \
+    --build-arg mongodb_tools_version_s390x="${MONGODB_DATABASE_TOOLS_BASE}-rhel9-s390x-${TOOLS_VERSION}.tgz" \
+    --build-arg mongodb_tools_version_ppc64le="${MONGODB_DATABASE_TOOLS_BASE}-rhel9-ppc64le-${TOOLS_VERSION}.tgz"
+
+docker push "${BASE_REPO_URL}mongodb-agent:${AGENT_VERSION}_${VERSION}"
+
 ```

docker/mongodb-kubernetes-database/README.md

@@ -39,7 +39,7 @@ this images with.
 For building the MongoDB Database image locally use the example command:
 
 ```bash
-VERSION="1.0.1"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-database/Dockerfile -t "mongodb-kubernetes-database:${VERSION}" \
+VERSION="1.3.0"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-database/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-database:${VERSION}" \
  --build-arg VERSION="${VERSION}"
 ```

docker/mongodb-kubernetes-init-appdb/README.md

@@ -3,9 +3,13 @@
 For building the MongoDB Init AppDB image locally use the example command:
 
 ```bash
-VERSION="1.0.1"
-MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-appdb/Dockerfile -t "mongodb-kubernetes-init-appdb:${VERSION}" \
+VERSION="1.3.0"
+MONGODB_TOOLS_URL="https://downloads.mongodb.org/tools/db"
+docker buildx build --load --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-kubernetes-init-appdb/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-init-appdb:${VERSION}" \
  --build-arg version="${VERSION}" \
- --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}"
+ --build-arg mongodb_tools_url="${MONGODB_TOOLS_URL_UBI}" \
+ --build-arg mongodb_tools_version_arm64="mongodb-database-tools-rhel93-aarch64-100.12.0.tgz" \
+ --build-arg mongodb_tools_version_amd64="mongodb-database-tools-rhel93-x86_64-100.12.0.tgz" \
+ --build-arg mongodb_tools_version_s390x="mongodb-database-tools-rhel9-s390x-100.12.0.tgz" \
+ --build-arg mongodb_tools_version_ppc64le="mongodb-database-tools-rhel9-ppc64le-100.12.0.tgz"
 ```

docker/mongodb-kubernetes-init-database/README.md

@@ -3,9 +3,19 @@
 For building the MongoDB Init AppDB image locally use the example command:
 
 ```bash
-VERSION="1.0.1"
-MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-database/Dockerfile -t "mongodb-kubernetes-init-database:${VERSION}" \
+VERSION="1.3.0"
+TOOLS_VERSION="100.12.0"
+MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db"
+docker buildx build --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-kubernetes-init-database/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-init-database:${VERSION}" \
  --build-arg version="${VERSION}" \
- --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}"
+ --build-arg mongodb_tools_url="${MONGODB_TOOLS_URL_UBI}" \
+ --build-arg mongodb_tools_version_arm64="mongodb-database-tools-rhel93-aarch64-${TOOLS_VERSION}.tgz" \
+ --build-arg mongodb_tools_version_amd64="mongodb-database-tools-rhel93-x86_64-${TOOLS_VERSION}.tgz" \
+ --build-arg mongodb_tools_version_s390x="mongodb-database-tools-rhel9-s390x-${TOOLS_VERSION}.tgz" \
+ --build-arg mongodb_tools_version_ppc64le="mongodb-database-tools-rhel9-ppc64le-${TOOLS_VERSION}.tgz"
+
+docker push "${BASE_REPO_URL}mongodb-kubernetes-init-database:${VERSION}"
 ```
+
+first no cache 2:20.28 total
+second no cache 2:31.74 total

docker/mongodb-kubernetes-init-database/content/agent-launcher.sh

@@ -206,10 +206,10 @@ else
     ln -sf "${MONGOD_ROOT}/bin/mongod" ${mdb_downloads_dir}/mongod/bin/mongod
     ln -sf "${MONGOD_ROOT}/bin/mongos" ${mdb_downloads_dir}/mongod/bin/mongos
 
-    ln -sf "/tools/mongodump" ${mdb_downloads_dir}/mongod/bin/mongodump
-    ln -sf "/tools/mongorestore" ${mdb_downloads_dir}/mongod/bin/mongorestore
-    ln -sf "/tools/mongoexport" ${mdb_downloads_dir}/mongod/bin/mongoexport
-    ln -sf "/tools/mongoimport" ${mdb_downloads_dir}/mongod/bin/mongoimport
+    for tool in mongoimport mongodump mongorestore mongoexport; do
+      [ -e "/tools/${tool}" ] || { echo "/tools/${tool} not found"; exit 1; }
+      ln -sf "/tools/${tool}" ${mdb_downloads_dir}/mongod/bin/${tool}
+    done
   else
     echo "Mongod PID not found within the specified time."
     exit 1

docker/mongodb-kubernetes-operator/README.md

@@ -13,13 +13,16 @@ CGO_ENABLED=0 GOOS=linux GOFLAGS="-mod=vendor" go build -i -o mongodb-kubernetes
 For building the MongoDB Init Ops Manager image locally use the example command:
 
 ```bash
-VERSION="1.1.0"
+VERSION="evergreen"
 LOG_AUTOMATION_CONFIG_DIFF="false"
 USE_RACE="false"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-operator/Dockerfile -t "mongodb-kubernetes-operator:${VERSION}" \
+BASE_REPO_URL="268558157000.dkr.ecr.us-east-1.amazonaws.com/lucian.tosa/"
+docker buildx build --load --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-kubernetes-operator/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes:${VERSION}" \
  --build-arg version="${VERSION}" \
  --build-arg log_automation_config_diff="${LOG_AUTOMATION_CONFIG_DIFF}" \
  --build-arg use_race="${USE_RACE}"
+
+docker push "${BASE_REPO_URL}mongodb-kubernetes:${VERSION}"
 ```
 
 ### Running locally