Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
189 commits
Select commit Hold shift + click to select a range
b341dc3
Dockerfiles
lucian-tosa Jul 29, 2025
a2479b8
Optimize init database
lucian-tosa Jul 29, 2025
abe4a2c
Optimize operator
lucian-tosa Jul 29, 2025
fd701b2
add minikube scripts
nammn Jul 29, 2025
05cbe23
smoke test replicacset
nammn Jul 29, 2025
a1f3d90
smoke test replicacset
nammn Jul 29, 2025
2d335f3
add minikube and make aws multiarch
nammn Jul 29, 2025
b9ceed6
Agent dockerfiles
lucian-tosa Jul 29, 2025
389b2b1
Optimize readiness and upgrade hook
lucian-tosa Jul 29, 2025
6649987
Re-design pipeline
Julien-Ben Jun 12, 2025
675bee4
Remove file
Julien-Ben Jul 29, 2025
833e25f
Put lib back in dependencies
Julien-Ben Jul 29, 2025
15e7f51
add todo
Julien-Ben Jul 29, 2025
120c1af
Fix
Julien-Ben Jul 29, 2025
c9ceabf
Remove multi arch call, fix test image path
Julien-Ben Jul 29, 2025
46f0998
make jq multiarch and all other scriupts as well
nammn Jul 30, 2025
433cdc1
fix jq
nammn Jul 30, 2025
1612525
fix docker, minikube etc
nammn Jul 30, 2025
bf8e64a
remove docker group management
nammn Jul 30, 2025
fb87f4d
Fix agent version for default case
Julien-Ben Jul 30, 2025
c05e180
Lindt
Julien-Ben Jul 30, 2025
747c4ba
isort
Julien-Ben Jul 30, 2025
03fd9b8
Cleanup TODOs
Julien-Ben Jul 30, 2025
540b420
installation works, minikube starts but docker doesn't start
nammn Jul 30, 2025
fd8db45
podman support
nammn Jul 31, 2025
284c7e1
z series support
nammn Jul 31, 2025
00439c0
custom container with working power critcl
nammn Jul 31, 2025
c675c83
custom container with working power critcl
nammn Jul 31, 2025
37c31de
add insecure
nammn Jul 31, 2025
148779d
add empty config handling and broken podman making
nammn Jul 31, 2025
10811d7
handle edge cases
nammn Jul 31, 2025
8d72a1c
Build cli
lucian-tosa Aug 1, 2025
6b96e7f
E2E dockerfile
lucian-tosa Aug 1, 2025
213887b
Operator dockerfile
lucian-tosa Aug 1, 2025
fd4367d
Prepare script
lucian-tosa Aug 1, 2025
49ddbe2
Readmes
lucian-tosa Aug 1, 2025
449152f
Fix e2e dockerfile
lucian-tosa Aug 1, 2025
a4cc24f
use python wheel locacl build, unify teardown for minikube, use run f…
nammn Aug 1, 2025
d72017a
handle kube secret for podman
nammn Aug 1, 2025
0207326
handle path
nammn Aug 1, 2025
0bd74d8
handle auth issue for secret
nammn Aug 1, 2025
5cfdd82
use lucian evg and remove debug mode
nammn Aug 1, 2025
0b6d7d3
Merge branch 'master' into multi-arch-dockerfiles
lucian-tosa Aug 4, 2025
3755fdd
Fix conflicts
lucian-tosa Aug 4, 2025
65e9382
Merge branch 'e2e-ibm' into multi-arch-dockerfiles
lucian-tosa Aug 4, 2025
1fbb8d5
Rename arch -> platform
Julien-Ben Aug 4, 2025
7c0cfbd
fix z and workdir setup
nammn Aug 4, 2025
718d3cc
fix z and workdir setup
nammn Aug 4, 2025
e9a524f
Don't rely on exception to check for builder existence
Julien-Ben Aug 4, 2025
fa6b899
Remove unused variables
Julien-Ben Aug 4, 2025
426e522
Pre commit
Julien-Ben Aug 4, 2025
2c16902
Merge branch 'e2e-ibm' into multi-arch-dockerfiles
lucian-tosa Aug 4, 2025
6961175
include e2e
nammn Aug 4, 2025
b3d36a7
Merge branch 'e2e-ibm' into multi-arch-dockerfiles
nammn Aug 4, 2025
6890858
Cleanup
Julien-Ben Aug 4, 2025
aab9592
Correct build envs
Julien-Ben Aug 4, 2025
33173bb
Lindt
Julien-Ben Aug 4, 2025
f48c19e
skip pip iunstall
nammn Aug 4, 2025
74e867c
Update Makefile
Julien-Ben Aug 4, 2025
b13b054
Add TODO
Julien-Ben Aug 4, 2025
832ce61
Revert "Pre commit"
Julien-Ben Aug 4, 2025
ff1a5bc
fix pythyin installation and wrong busybox
nammn Aug 4, 2025
4aa33d9
Fix contexts for smoke tests
lucian-tosa Aug 4, 2025
cc1f99d
fix contexts
nammn Aug 4, 2025
91efed9
Merge branch 'multi-arch-dockerfiles' of github.com:mongodb/mongodb-k…
nammn Aug 4, 2025
dfdad75
don't target one container
nammn Aug 4, 2025
e9685a8
arm support
nammn Aug 5, 2025
df618e5
fix kubectl commands
nammn Aug 5, 2025
6c9bff6
add python auth, fix myreport copy, force docker auth
nammn Aug 5, 2025
e949a1c
handle pyenv exists
nammn Aug 5, 2025
fbb1432
fix for containerruntime
nammn Aug 5, 2025
aa9c64a
fix for containerruntime
nammn Aug 5, 2025
bc23827
Remove agent unused functions
Julien-Ben Aug 6, 2025
03062c3
Remove debug
Julien-Ben Aug 6, 2025
4d4e4e9
Remove args iteration for multi platform
Julien-Ben Aug 6, 2025
7c9967a
Cleanup unused stuff
Julien-Ben Aug 6, 2025
a7c63c9
Cleanup
Julien-Ben Aug 6, 2025
742e784
Rename file
Julien-Ben Aug 6, 2025
1f0a21b
Remove cli sbom
Julien-Ben Aug 6, 2025
813d539
Renamed image building file
Julien-Ben Aug 6, 2025
c06061b
Freeze python on whales
Julien-Ben Aug 6, 2025
5f9d49a
Lint
Julien-Ben Aug 6, 2025
f390dc9
Remove everything SBOM related
Julien-Ben Aug 6, 2025
a47341d
Lint
Julien-Ben Aug 6, 2025
972b23c
Add TODO
Julien-Ben Aug 6, 2025
4ae4034
Remove --all-agents
Julien-Ben Aug 6, 2025
291f043
Merge branch 'master' into julienben/redesign-pipeline
MaciejKaras Aug 7, 2025
af28807
refactoring and cleanups on architecture and minikube handling
nammn Aug 7, 2025
88c76bc
Rename trace
Julien-Ben Aug 7, 2025
0fd4db8
Remove operator build
Julien-Ben Aug 7, 2025
ee86ebf
Doc and logs
Julien-Ben Aug 7, 2025
5f5940f
Use build_image_generic for test images too
Julien-Ben Aug 7, 2025
6dd208f
Remove unused sign images in repositories
Julien-Ben Aug 7, 2025
493d4d6
Remove pipeline_process_image
Julien-Ben Aug 7, 2025
a21b254
Remove process_image
Julien-Ben Aug 7, 2025
a7db180
Rename function
Julien-Ben Aug 7, 2025
52b8662
Lint
Julien-Ben Aug 7, 2025
e465582
wip: Initial changes
MaciejKaras Aug 1, 2025
8a4e4b7
merge redesign-pipeline branch
MaciejKaras Aug 6, 2025
5bfacf6
Fixes after merging remote branch
MaciejKaras Aug 6, 2025
9733b45
Add sign option + change staging registries
MaciejKaras Aug 6, 2025
5ab9c08
Add agent and ops-manager to build_info.json
MaciejKaras Aug 6, 2025
e6d67ca
Fix issue with scenario
MaciejKaras Aug 6, 2025
7a34092
Fix for `build_info` computation
MaciejKaras Aug 7, 2025
a71ccf6
Pipeline fixes
MaciejKaras Aug 7, 2025
3be7731
Remove `all-agents` option
MaciejKaras Aug 7, 2025
1aae28b
Add missing `--sign` option
MaciejKaras Aug 7, 2025
e00b0e3
Fix agent matrix build
MaciejKaras Aug 7, 2025
f894e5b
Disable concurrent builds
MaciejKaras Aug 7, 2025
b140220
Move all env vars to constants.py
MaciejKaras Aug 7, 2025
7b5a064
Remove `operator-quick` image build process
MaciejKaras Aug 7, 2025
8df2ce4
Rebase fix
MaciejKaras Aug 7, 2025
b6b05aa
Add release scenarios for agent and ops-manager
MaciejKaras Aug 7, 2025
c5ad3c5
merge from Julien branch
MaciejKaras Aug 8, 2025
031dd5b
Merge branch 'master' into julienben/redesign-pipeline
Julien-Ben Aug 8, 2025
8183ec5
Fix release_info.py structure
MaciejKaras Aug 8, 2025
e7ab93b
Merge branch 'julienben/redesign-pipeline' into maciejk/use-ar-relate…
MaciejKaras Aug 8, 2025
2ec7587
Explicitly push to ECR with latest tag. Staging as a followup
Julien-Ben Aug 8, 2025
1badff0
Ensure builder in main to fix race conditions
Julien-Ben Aug 8, 2025
9e2815a
Log line
Julien-Ben Aug 8, 2025
e17b323
Remove unused is_running_in_evg_pipeline
Julien-Ben Aug 8, 2025
075fcae
Typo from merge conflict
Julien-Ben Aug 8, 2025
afc9b79
Follow up TODO
Julien-Ben Aug 8, 2025
3ef9e2c
Login for garasign image
Julien-Ben Aug 8, 2025
d2a6153
Handle builder creation race condition with an exception
Julien-Ben Aug 8, 2025
c6fc163
Cleanup ensure
Julien-Ben Aug 8, 2025
5b42663
Add test image building
lucian-tosa Aug 8, 2025
abd6180
Fix dockerfile
lucian-tosa Aug 8, 2025
c361d10
Merge remote-tracking branch 'refs/remotes/origin/julienben/redesign-…
lucian-tosa Aug 8, 2025
347b44b
Revert "Handle builder creation race condition with an exception"
Julien-Ben Aug 8, 2025
e2a4126
Revert "Cleanup ensure"
Julien-Ben Aug 8, 2025
715c4ad
Rename trace
Julien-Ben Aug 8, 2025
e117f79
Merge branch 'julienben/redesign-pipeline' into maciejk/use-ar-relate…
MaciejKaras Aug 8, 2025
2125cb7
Remove comment
Julien-Ben Aug 8, 2025
d047de5
Merge branch 'julienben/redesign-pipeline' into maciejk/use-ar-relate…
MaciejKaras Aug 8, 2025
c8b66fe
Merge branch 'master' into maciejk/use-ar-related-versions
MaciejKaras Aug 8, 2025
62c82f1
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into m…
nammn Aug 11, 2025
fa9c7ee
Review fixes
MaciejKaras Aug 11, 2025
e56591c
Merge branch 'master' into maciejk/use-ar-related-versions
MaciejKaras Aug 11, 2025
597edf2
Added comment to get_version_id() method
MaciejKaras Aug 11, 2025
857f705
Revert parallel `max_workers = 1`
MaciejKaras Aug 11, 2025
59e4420
Agent image fix
MaciejKaras Aug 11, 2025
2eebf0f
Merge branch 'master' into maciejk/use-ar-related-versions
MaciejKaras Aug 11, 2025
d6d5b81
merge maciejk/use-ar-related-versions
nammn Aug 11, 2025
1385fa5
add agent multi-arch buildinfo
nammn Aug 11, 2025
0cb392b
add multi arch support for all binaries but not part of patch
nammn Aug 11, 2025
9ed77b4
for now build on every patch
nammn Aug 11, 2025
d90ae2e
fix links
nammn Aug 11, 2025
dff3ceb
fix agent links, make agent conditional
nammn Aug 11, 2025
66d2eb4
make agent targetplatform and .evergreen power and z support and fix …
nammn Aug 12, 2025
5d00002
fix agent and init dbs
nammn Aug 12, 2025
0c2ab1d
try minikube setup
nammn Aug 12, 2025
2b0e019
fix rhel path
nammn Aug 12, 2025
009bea5
linter, reordering minkube, fix agents
nammn Aug 13, 2025
d36f392
linter, reordering minkube, fix agents, fix venv, fix python run path
nammn Aug 13, 2025
1c3a7ad
remove lucians images
nammn Aug 13, 2025
cac43ca
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into m…
nammn Aug 13, 2025
d707450
ibm smoke tests only on master merges
nammn Aug 13, 2025
d7f0538
fix master merge
nammn Aug 13, 2025
40f9aa1
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into m…
nammn Aug 18, 2025
65d6296
pipeline
nammn Aug 18, 2025
5eb0310
support releasing latest agents
nammn Aug 18, 2025
d1fd1e1
refactor agent support and support releasing latest used agents
nammn Aug 18, 2025
6091c73
CLOUDP-337356 - static support (#333)
nammn Aug 19, 2025
9368a93
Remove multi-arch from init-om image
lucian-tosa Aug 19, 2025
2e55f50
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into m…
nammn Aug 19, 2025
3f81fd6
Merge branch 'multi-arch-pipeline-combined' of github.com:mongodb/mon…
nammn Aug 19, 2025
af2eee3
ibm power only support 8.x.x and reset agent pins
nammn Aug 19, 2025
489c791
Multi refactoring arch (#354)
nammn Aug 20, 2025
67b3992
migrate repo from mongodb/mongodb-agent-ubi to mongodb/mongodb-agent
nammn Aug 20, 2025
89f4f9d
migrate repo from mongodb/mongodb-agent-ubi to mongodb/mongodb-agent
nammn Aug 20, 2025
60c7875
migrate ecr
nammn Aug 20, 2025
9a349b9
migrate helm
nammn Aug 20, 2025
f7417c0
add release notes
nammn Aug 20, 2025
3b39859
remove not used agent
nammn Aug 21, 2025
74328eb
fix merge
nammn Aug 25, 2025
33e7ee0
fix merge
nammn Aug 25, 2025
59ee174
Cleanup
lucian-tosa Aug 26, 2025
7a3f356
Merge branch 'master' into migrate-repo
lucian-tosa Aug 26, 2025
703b56e
Fix unit test
lucian-tosa Aug 26, 2025
1539447
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into m…
nammn Aug 26, 2025
ccde9d2
Merge branch 'migrate-repo' of github.com:mongodb/mongodb-kubernetes …
nammn Aug 26, 2025
80857b4
add release notes
nammn Aug 26, 2025
1d7b447
Update RN
lucian-tosa Aug 27, 2025
5eb1b15
Fix tools in agent images (#376)
lucian-tosa Aug 28, 2025
cd8672c
Merge branch 'master' into migrate-repo
nammn Aug 28, 2025
061992c
Apply suggestion from @viveksinghggits
nammn Aug 28, 2025
1c9998c
fix
nammn Aug 28, 2025
6afdada
fix 2 removing lucian
nammn Aug 28, 2025
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
4 changes: 2 additions & 2 deletions build_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 10 additions & 0 deletions changelog/20250826_feature_migrate_agent_repo.md
Original file line number Diff line number Diff line change
@@ -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.
38 changes: 18 additions & 20 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/operator/appdbreplicaset_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
12 changes: 6 additions & 6 deletions controllers/operator/appdbreplicaset_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
},
Expand All @@ -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
}
}
Expand All @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions controllers/operator/mongodbreplicaset_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
7 changes: 5 additions & 2 deletions docker/mongodb-agent/Dockerfile.atomic
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
35 changes: 26 additions & 9 deletions docker/mongodb-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,30 @@ 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="1.3.0"
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"
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}"

```
4 changes: 2 additions & 2 deletions docker/mongodb-kubernetes-database/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
```
12 changes: 8 additions & 4 deletions docker/mongodb-kubernetes-init-appdb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```
18 changes: 14 additions & 4 deletions docker/mongodb-kubernetes-init-database/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions docker/mongodb-kubernetes-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ 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="1.3.0"
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}" \
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
Expand Down
Loading