migrate all agents to ubi (#1577)

mongodb · Jul 2, 2024 · 3108a94 · 3108a94
1 parent efc91be
commit 3108a94
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -45,7 +45,7 @@ spec:
         - name: OPERATOR_NAME
           value: mongodb-kubernetes-operator
         - name: AGENT_IMAGE
-          value: quay.io/mongodb/mongodb-agent:107.0.1.8507-1
+          value: quay.io/mongodb/mongodb-agent-ubi:107.0.1.8507-1
         - name: VERSION_UPGRADE_HOOK_IMAGE
           value: quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.8
         - name: READINESS_PROBE_IMAGE

diff --git a/deploy/openshift/operator_openshift.yaml b/deploy/openshift/operator_openshift.yaml
@@ -47,7 +47,7 @@ spec:
         - name: OPERATOR_NAME
           value: mongodb-kubernetes-operator
         - name: AGENT_IMAGE
-          value: quay.io/mongodb/mongodb-agent:107.0.1.8507-1
+          value: quay.io/mongodb/mongodb-agent-ubi:107.0.1.8507-1
         - name: READINESS_PROBE_IMAGE
           value: quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.19
         - name: VERSION_UPGRADE_HOOK_IMAGE

diff --git a/scripts/dev/templates/agent/README.md b/scripts/dev/templates/agent/README.md
@@ -3,6 +3,6 @@
 This folder contains the `Dockerfile` used to build [https://quay.io/repository/mongodb/mongodb-agent](https://quay.io/repository/mongodb/mongodb-agent). To build and push a new image to quay.io, use the following commands:
 
 ```
-docker build . --build-arg agent_version=${agent_version} --build-arg tools_version=${tools_version} -t "quay.io/mongodb/mongodb-agent:${agent_version}"
-docker push "quay.io/mongodb/mongodb-agent:${agent_version}"
+docker build . --build-arg agent_version=${agent_version} --build-arg tools_version=${tools_version} -t "quay.io/mongodb/mongodb-agent-ubi:${agent_version}"
+docker push "quay.io/mongodb/mongodb-agent-ubi:${agent_version}"
 ```
diff --git a/test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go b/test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go
@@ -82,7 +82,7 @@ func TestReplicaSetOperatorUpgradeFrom0_7_2(t *testing.T) {
 	testConfig.OperatorImage = "quay.io/mongodb/mongodb-kubernetes-operator:0.7.2"
 	testConfig.VersionUpgradeHookImage = "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.3"
 	testConfig.ReadinessProbeImage = "quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.6"
-	testConfig.AgentImage = "quay.io/mongodb/mongodb-agent:11.0.5.6963-1"
+	testConfig.AgentImage = "quay.io/mongodb/mongodb-agent-ubi:11.0.5.6963-1"
 
 	testCtx := setup.SetupWithTestConfig(ctx, t, testConfig, true, false, resourceName)
 	defer testCtx.Teardown()

diff --git a/test/e2e/setup/test_config.go b/test/e2e/setup/test_config.go
@@ -41,7 +41,7 @@ func LoadTestConfigFromEnv() TestConfig {
 		MongoDBImage:            envvar.GetEnvOrDefault(construct.MongodbImageEnv, "mongodb-community-server"),
 		MongoDBRepoUrl:          envvar.GetEnvOrDefault(construct.MongodbRepoUrl, "quay.io/mongodb"),
 		VersionUpgradeHookImage: envvar.GetEnvOrDefault(construct.VersionUpgradeHookImageEnv, "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.2"),
-		AgentImage:              envvar.GetEnvOrDefault(construct.AgentImageEnv, "quay.io/mongodb/mongodb-agent:10.29.0.6830-1"), // TODO: better way to decide default agent image.
+		AgentImage:              envvar.GetEnvOrDefault(construct.AgentImageEnv, "quay.io/mongodb/mongodb-agent-ubi:10.29.0.6830-1"), // TODO: better way to decide default agent image.
 		ClusterWide:             envvar.ReadBool(clusterWideEnvName),
 		PerformCleanup:          envvar.ReadBool(performCleanupEnvName),
 		ReadinessProbeImage:     envvar.GetEnvOrDefault(construct.ReadinessProbeImageEnv, "quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.3"),