Skip to content

CLOUDP-336718: Bump Ops Manager Container Image version to 8.0.12 #318

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.

Sign up for GitHub

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+64 −72
Open

CLOUDP-336718: Bump Ops Manager Container Image version to 8.0.12 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5b081af
Updated
mms-build-account Aug 7, 2025
b1bd4f0
Run pre-commit hook
Aug 7, 2025
a34a3b6
fix paths
nammn Aug 7, 2025
c7c0bef
Remove missing agent version
mircea-cosbuc Aug 7, 2025
a6f7c96
Run pre-commit hook
Aug 7, 2025
0c0d5e4
Bump mongosh dependency
mircea-cosbuc Aug 8, 2025
82660f8
Remove OM 6.0.25 from list of supported OM versions
mircea-cosbuc Aug 8, 2025
c9ebd7a
Run pre-commit hook
Aug 8, 2025
f4c865e
Quick fix for Dockerfile conflict with sonar
MaciejKaras Aug 8, 2025
dc30573
Fix agent and tools distros
MaciejKaras Aug 8, 2025
d801c48
Merge branch 'master' into CLOUDP-336718_om_image_version_bump
MaciejKaras Aug 8, 2025
c3ff667
Merge branch 'maciejk/master-fix' into CLOUDP-336718_om_image_version…
MaciejKaras Aug 8, 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
2 changes: 1 addition & 1 deletion .evergreen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:

- &ops_manager_70_latest 7.0.15 # The order/index is important, since these are anchors. Please do not change

- &ops_manager_80_latest 8.0.11 # The order/index is important, since these are anchors. Please do not change
- &ops_manager_80_latest 8.0.12 # The order/index is important, since these are anchors. Please do not change

# The dependency unification between static and non-static is intentional here.
# Even though some images are exclusive, in EVG they all are built once and in parallel.
Expand Down
20 changes: 10 additions & 10 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,14 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_0_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.0.1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_1_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1
Expand Down Expand Up @@ -226,14 +234,6 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_1
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.1"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_1_0
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1
Expand All @@ -258,8 +258,6 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.2.0"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
- 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 Expand Up @@ -292,6 +290,8 @@ spec:
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.7"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_11
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.11"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_12
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.12"
# since the official server images end with a different suffix we can re-use the same $mongodbImageEnv
- name: RELATED_IMAGE_MONGODB_IMAGE_4_4_0_ubi8
value: "quay.io/mongodb/mongodb-enterprise-server:4.4.0-ubi8"
Expand Down
0 docker/mongodb-agent/Dockerfile → docker/mongodb-agent/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 ...mongodb-enterprise-ops-manager/Dockerfile → ...-enterprise-ops-manager/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 ...er/mongodb-kubernetes-database/Dockerfile → ...odb-kubernetes-database/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 .../mongodb-kubernetes-init-appdb/Dockerfile → ...b-kubernetes-init-appdb/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 ...ngodb-kubernetes-init-database/Dockerfile → ...ubernetes-init-database/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 ...db-kubernetes-init-ops-manager/Dockerfile → ...rnetes-init-ops-manager/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 ...er/mongodb-kubernetes-operator/Dockerfile → ...odb-kubernetes-operator/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
0 ...godb-kubernetes-readinessprobe/Dockerfile → ...bernetes-readinessprobe/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/remote_fixtures/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ spec:
volumeMounts:
- name: mongosh-versions
mountPath: /mongodb-ops-manager/mongodb-releases/compass
- name: setting-up-mongosh-2-5-3
- name: setting-up-mongosh-2-5-6
image: curlimages/curl:latest
command:
- sh
- -c
- curl -LO https://downloads.mongodb.com/compass/mongosh-2.5.3-linux-x64-openssl11.tgz --output-dir /mongodb-ops-manager/mongodb-releases/compass && true
- curl -LO https://downloads.mongodb.com/compass/mongosh-2.5.6-linux-x64-openssl11.tgz --output-dir /mongodb-ops-manager/mongodb-releases/compass && true
volumeMounts:
- name: mongosh-versions
mountPath: /mongodb-ops-manager/mongodb-releases/compass
Expand Down
0 ...ongodb-kubernetes-upgrade-hook/Dockerfile → ...kubernetes-upgrade-hook/Dockerfile.atomic
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions helm_chart/values-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ operator:
version: 1.2.0
relatedImages:
opsManager:
- 6.0.25
- 6.0.26
- 6.0.27
- 7.0.11
Expand All @@ -47,6 +46,7 @@ relatedImages:
- 8.0.6
- 8.0.7
- 8.0.11
- 8.0.12
mongodb:
- 4.4.0-ubi8
- 4.4.1-ubi8
Expand Down Expand Up @@ -126,6 +126,10 @@ relatedImages:
- 108.0.11.8830-1_1.0.1
- 108.0.11.8830-1_1.1.0
- 108.0.11.8830-1_1.2.0
- 108.0.12.8846-1
- 108.0.12.8846-1_1.0.1
- 108.0.12.8846-1_1.1.0
- 108.0.12.8846-1_1.2.0
- 108.0.2.8729-1
- 108.0.2.8729-1_1.0.1
- 108.0.2.8729-1_1.1.0
Expand All @@ -146,10 +150,6 @@ relatedImages:
- 108.0.7.8810-1_1.0.1
- 108.0.7.8810-1_1.1.0
- 108.0.7.8810-1_1.2.0
- 12.0.33.7866-1
- 12.0.33.7866-1_1.0.1
- 12.0.33.7866-1_1.1.0
- 12.0.33.7866-1_1.2.0
- 12.0.34.7888-1
- 12.0.34.7888-1_1.0.1
- 12.0.34.7888-1_1.1.0
Expand Down
20 changes: 10 additions & 10 deletions public/mongodb-kubernetes-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,14 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_0_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.0.1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_1_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1
Expand Down Expand Up @@ -530,14 +538,6 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_1
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.1"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_1_0
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1
Expand All @@ -562,8 +562,6 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.2.0"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
- 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 Expand Up @@ -596,6 +594,8 @@ spec:
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.7"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_11
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.11"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_12
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.12"
# since the official server images end with a different suffix we can re-use the same $mongodbImageEnv
- name: RELATED_IMAGE_MONGODB_IMAGE_4_4_0_ubi8
value: "quay.io/mongodb/mongodb-enterprise-server:4.4.0-ubi8"
Expand Down
12 changes: 6 additions & 6 deletions release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"ops-manager": {
"ssdlc_name": "MongoDB Controllers for Kubernetes Enterprise Ops Manager",
"versions": [
"6.0.25",
"6.0.26",
"6.0.27",
"7.0.11",
Expand All @@ -54,7 +53,8 @@
"8.0.5",
"8.0.6",
"8.0.7",
"8.0.11"
"8.0.11",
"8.0.12"
],
"variants": [
"ubi"
Expand Down Expand Up @@ -108,10 +108,6 @@
"cloud_manager": "13.37.0.9590-1",
"cloud_manager_tools": "100.12.2",
"ops_manager": {
"6.0.25": {
"agent_version": "12.0.33.7866-1",
"tools_version": "100.10.0"
},
"6.0.26": {
"agent_version": "12.0.34.7888-1",
"tools_version": "100.10.0"
Expand Down Expand Up @@ -175,6 +171,10 @@
"8.0.11": {
"agent_version": "108.0.11.8830-1",
"tools_version": "100.12.2"
},
"8.0.12": {
"agent_version": "108.0.12.8846-1",
"tools_version": "100.12.2"
}
}
},
Expand Down
68 changes: 30 additions & 38 deletions scripts/release/atomic_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def build_operator_image(build_configuration: BuildConfiguration):
image_name = "mongodb-kubernetes"
build_image(
image_name=image_name,
dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile",
dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile.atomic",
build_configuration=build_configuration,
extra_args=args,
)
Expand All @@ -131,7 +131,7 @@ def build_database_image(build_configuration: BuildConfiguration):
args = {"version": build_configuration.version}
build_image(
image_name="mongodb-kubernetes-database",
dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile",
dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile.atomic",
build_configuration=build_configuration,
extra_args=args,
)
Expand Down Expand Up @@ -182,7 +182,7 @@ def build_init_om_image(build_configuration: BuildConfiguration):
args = {"version": build_configuration.version}
build_image(
image_name="mongodb-kubernetes-init-ops-manager",
dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile",
dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic",
build_configuration=build_configuration,
extra_args=args,
)
Expand All @@ -206,7 +206,7 @@ def build_om_image(build_configuration: BuildConfiguration):

build_image(
image_name="mongodb-enterprise-ops-manager-ubi",
dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile",
dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic",
build_configuration=build_configuration,
extra_args=args,
)
Expand Down Expand Up @@ -268,7 +268,7 @@ def build_init_appdb(build_configuration: BuildConfiguration):
args = {"version": build_configuration.version, "mongodb_tools_url_ubi": mongodb_tools_url_ubi}
build_image(
image_name="mongodb-kubernetes-init-appdb",
dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile",
dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic",
build_configuration=build_configuration,
extra_args=args,
)
Expand All @@ -282,7 +282,7 @@ def build_init_database(build_configuration: BuildConfiguration):
args = {"version": build_configuration.version, "mongodb_tools_url_ubi": mongodb_tools_url_ubi}
build_image(
"mongodb-kubernetes-init-database",
"docker/mongodb-kubernetes-init-database/Dockerfile",
"docker/mongodb-kubernetes-init-database/Dockerfile.atomic",
build_configuration=build_configuration,
extra_args=args,
)
Expand All @@ -299,10 +299,10 @@ def build_community_image(build_configuration: BuildConfiguration, image_type: s

if image_type == "readiness-probe":
image_name = "mongodb-kubernetes-readinessprobe"
dockerfile_path = "docker/mongodb-kubernetes-readinessprobe/Dockerfile"
dockerfile_path = "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic"
elif image_type == "upgrade-hook":
image_name = "mongodb-kubernetes-operator-version-upgrade-post-start-hook"
dockerfile_path = "docker/mongodb-kubernetes-upgrade-hook/Dockerfile"
dockerfile_path = "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic"
else:
raise ValueError(f"Unsupported community image type: {image_type}")

Expand Down Expand Up @@ -338,28 +338,27 @@ def build_upgrade_hook_image(build_configuration: BuildConfiguration):

def build_agent_pipeline(
build_configuration: BuildConfiguration,
image_version,
init_database_image,
mongodb_tools_url_ubi,
mongodb_agent_url_ubi: str,
agent_version,
operator_version: str,
agent_version: str,
agent_distro: str,
tools_version: str,
tools_distro: str,
):
image_version = f"{agent_version}_{operator_version}"

build_configuration_copy = copy(build_configuration)
build_configuration_copy.version = image_version
args = {
"version": image_version,
"agent_version": agent_version,
"ubi_suffix": "-ubi",
"release_version": image_version,
"init_database_image": init_database_image,
"mongodb_tools_url_ubi": mongodb_tools_url_ubi,
"mongodb_agent_url_ubi": mongodb_agent_url_ubi,
"quay_registry": build_configuration.base_registry,
"agent_distro": agent_distro,
"tools_version": tools_version,
"tools_distro": tools_distro,
}

build_image(
image_name="mongodb-agent-ubi",
dockerfile_path="docker/mongodb-agent/Dockerfile",
dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",
build_configuration=build_configuration_copy,
extra_args=args,
)
Expand Down Expand Up @@ -392,15 +391,14 @@ def build_agent_default_case(build_configuration: BuildConfiguration):
with ProcessPoolExecutor(max_workers=max_workers) as executor:
logger.info(f"Running with factor of {max_workers}")
logger.info(f"======= Agent versions to build {agent_versions_to_build} =======")
for idx, agent_version in enumerate(agent_versions_to_build):
for idx, agent_tools_version in enumerate(agent_versions_to_build):
# We don't need to keep create and push the same image on every build.
# It is enough to create and push the non-operator suffixed images only during releases to ecr and quay.
logger.info(f"======= Building Agent {agent_version} ({idx}/{len(agent_versions_to_build)})")
logger.info(f"======= Building Agent {agent_tools_version} ({idx}/{len(agent_versions_to_build)})")
_build_agent_operator(
agent_version,
agent_tools_version,
build_configuration,
executor,
build_configuration.version,
tasks_queue,
)

Expand All @@ -420,31 +418,25 @@ def queue_exception_handling(tasks_queue):


def _build_agent_operator(
agent_version: Tuple[str, str],
agent_tools_version: Tuple[str, str],
build_configuration: BuildConfiguration,
executor: ProcessPoolExecutor,
operator_version: str,
tasks_queue: Queue,
):
agent_version = agent_tools_version[0]
agent_distro = "rhel9_x86_64"
tools_version = agent_version[1]
tools_version = agent_tools_version[1]
tools_distro = get_tools_distro(tools_version)["amd"]
image_version = f"{agent_version[0]}_{operator_version}"
mongodb_tools_url_ubi = (
f"https://downloads.mongodb.org/tools/db/mongodb-database-tools-{tools_distro}-{tools_version}.tgz"
)
mongodb_agent_url_ubi = f"https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-{agent_version[0]}.{agent_distro}.tar.gz"
init_database_image = f"{build_configuration.base_registry}/mongodb-kubernetes-init-database:{operator_version}"

tasks_queue.put(
executor.submit(
build_agent_pipeline,
build_configuration,
image_version,
init_database_image,
mongodb_tools_url_ubi,
mongodb_agent_url_ubi,
agent_version[0],
build_configuration.version,
agent_version,
agent_distro,
tools_version,
tools_distro,
)
)

Expand Down
Loading