Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate all agents to ubi #1577

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/openshift/operator_openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/dev/templates/agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
```
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/setup/test_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Loading