From 22aaeb6ab0a96490f7e967a63841718146dbfdf1 Mon Sep 17 00:00:00 2001 From: nam Date: Tue, 2 Jul 2024 10:18:32 +0200 Subject: [PATCH] migrate all agents to ubi --- config/manager/manager.yaml | 2 +- deploy/openshift/operator_openshift.yaml | 2 +- scripts/dev/templates/agent/README.md | 4 ++-- .../replica_set_operator_upgrade_test.go | 2 +- test/e2e/setup/test_config.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index f9b53dca4..044421f42 100644 --- 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 index 1d9fd43a8..5eb385528 100644 --- 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 index 0b9f1f797..d7ea6554a 100644 --- 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}" ``` \ No newline at end of file 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 index 9fe7278a9..726c52514 100644 --- 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 index 19e7c5d92..06f2018fe 100644 --- 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"),