From ebcfcdd53e04a1cd72e842cb0520e75a74b2bf6b Mon Sep 17 00:00:00 2001 From: Mircea Cosbuc Date: Thu, 20 Nov 2025 16:40:30 +0100 Subject: [PATCH 1/6] Use ubi-micro base images --- docker/mongodb-agent/Dockerfile | 2 +- docker/mongodb-enterprise-ops-manager/Dockerfile | 2 +- docker/mongodb-kubernetes-database/Dockerfile | 2 +- docker/mongodb-kubernetes-init-appdb/Dockerfile | 2 +- docker/mongodb-kubernetes-init-ops-manager/Dockerfile | 2 +- docker/mongodb-kubernetes-operator/Dockerfile | 2 +- docker/mongodb-kubernetes-readinessprobe/Dockerfile | 2 +- docker/mongodb-kubernetes-upgrade-hook/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/mongodb-agent/Dockerfile b/docker/mongodb-agent/Dockerfile index 15a534ca4..d508bcbab 100644 --- a/docker/mongodb-agent/Dockerfile +++ b/docker/mongodb-agent/Dockerfile @@ -54,7 +54,7 @@ RUN tar xfz /agent/mongodb_agent.tgz \ && rm /agent/mongodb_agent.tgz \ && rm -r mongodb-mms-automation-agent-* -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-micro # Replace libcurl-minimal and curl-minimal with the full versions # https://bugzilla.redhat.com/show_bug.cgi?id=1994521 diff --git a/docker/mongodb-enterprise-ops-manager/Dockerfile b/docker/mongodb-enterprise-ops-manager/Dockerfile index aa95b4bee..0ba6b4a71 100644 --- a/docker/mongodb-enterprise-ops-manager/Dockerfile +++ b/docker/mongodb-enterprise-ops-manager/Dockerfile @@ -19,7 +19,7 @@ COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-enterprise-ops-manager -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-micro ARG version ARG om_download_url diff --git a/docker/mongodb-kubernetes-database/Dockerfile b/docker/mongodb-kubernetes-database/Dockerfile index 9bf3a24bc..a9e58850f 100644 --- a/docker/mongodb-kubernetes-database/Dockerfile +++ b/docker/mongodb-kubernetes-database/Dockerfile @@ -2,7 +2,7 @@ FROM scratch AS base COPY ./docker/mongodb-kubernetes-database/LICENSE /data/licenses/mongodb-kubernetes-database -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi8/ubi-micro ENV MMS_HOME=/mongodb-automation ENV MMS_LOG_DIR=/var/log/mongodb-mms-automation diff --git a/docker/mongodb-kubernetes-init-appdb/Dockerfile b/docker/mongodb-kubernetes-init-appdb/Dockerfile index eeb48b288..7a45e7dae 100644 --- a/docker/mongodb-kubernetes-init-appdb/Dockerfile +++ b/docker/mongodb-kubernetes-init-appdb/Dockerfile @@ -53,7 +53,7 @@ COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/s COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/ -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi8/ubi-micro # Copy the extracted tools from the downloader stage (tools are already extracted there) COPY --from=tools_downloader /tools/ /tools/ diff --git a/docker/mongodb-kubernetes-init-ops-manager/Dockerfile b/docker/mongodb-kubernetes-init-ops-manager/Dockerfile index 07427ff0f..9814b8282 100644 --- a/docker/mongodb-kubernetes-init-ops-manager/Dockerfile +++ b/docker/mongodb-kubernetes-init-ops-manager/Dockerfile @@ -12,7 +12,7 @@ COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts/ COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-enterprise-ops-manager -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-micro ARG version diff --git a/docker/mongodb-kubernetes-operator/Dockerfile b/docker/mongodb-kubernetes-operator/Dockerfile index c08b228f9..053e1a574 100644 --- a/docker/mongodb-kubernetes-operator/Dockerfile +++ b/docker/mongodb-kubernetes-operator/Dockerfile @@ -44,7 +44,7 @@ COPY --from=builder /data/om_version_mapping.json /data/om_version_mapping.json ADD docker/mongodb-kubernetes-operator/licenses /data/licenses/ -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-micro # Building an UBI-based image: https://red.ht/3n6b9y0 RUN microdnf update \ diff --git a/docker/mongodb-kubernetes-readinessprobe/Dockerfile b/docker/mongodb-kubernetes-readinessprobe/Dockerfile index 55d661438..cc4b0c74f 100644 --- a/docker/mongodb-kubernetes-readinessprobe/Dockerfile +++ b/docker/mongodb-kubernetes-readinessprobe/Dockerfile @@ -12,6 +12,6 @@ ARG TARGETOS ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o /data/scripts/readinessprobe ./mongodb-community-operator/cmd/readiness/main.go -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-micro COPY --from=builder /data/scripts/readinessprobe /probes/readinessprobe diff --git a/docker/mongodb-kubernetes-upgrade-hook/Dockerfile b/docker/mongodb-kubernetes-upgrade-hook/Dockerfile index fab594d5e..12b6ecacc 100644 --- a/docker/mongodb-kubernetes-upgrade-hook/Dockerfile +++ b/docker/mongodb-kubernetes-upgrade-hook/Dockerfile @@ -12,6 +12,6 @@ ARG TARGETARCH ARG TARGETOS RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o /data/scripts/version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-micro COPY --from=builder /data/scripts/version-upgrade-hook /version-upgrade-hook From ccf3c9d5c655108d24df55fe55355e71bd922704 Mon Sep 17 00:00:00 2001 From: Mircea Cosbuc Date: Thu, 20 Nov 2025 21:59:47 +0100 Subject: [PATCH 2/6] Use pre-build ubi9-micro image --- docker/mongodb-agent/Dockerfile | 22 +--------------------- scripts/dev/contexts/root-context | 2 +- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/docker/mongodb-agent/Dockerfile b/docker/mongodb-agent/Dockerfile index d508bcbab..b9d42e935 100644 --- a/docker/mongodb-agent/Dockerfile +++ b/docker/mongodb-agent/Dockerfile @@ -54,27 +54,7 @@ RUN tar xfz /agent/mongodb_agent.tgz \ && rm /agent/mongodb_agent.tgz \ && rm -r mongodb-mms-automation-agent-* -FROM registry.access.redhat.com/ubi9/ubi-micro - -# Replace libcurl-minimal and curl-minimal with the full versions -# https://bugzilla.redhat.com/show_bug.cgi?id=1994521 -RUN microdnf install -y libssh libpsl libbrotli \ - && microdnf download curl libcurl \ - && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ - && microdnf remove -y libcurl-minimal curl-minimal - -RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper -# Copy-pasted from https://www.mongodb.com/docs/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/ -RUN microdnf install -y --disableplugin=subscription-manager \ - cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-plain krb5-libs openldap openssl xz-libs -# Dependencies for the Agent -RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 \ - net-snmp \ - net-snmp-agent-libs -RUN microdnf install -y --disableplugin=subscription-manager \ - hostname tar gzip procps jq \ - && microdnf upgrade -y \ - && rm -rf /var/lib/apt/lists/* +FROM quay.io/mircea_cosbuc/ubi-micro-agent-base RUN mkdir -p /agent \ && mkdir -p /var/lib/mongodb-mms-automation \ diff --git a/scripts/dev/contexts/root-context b/scripts/dev/contexts/root-context index 3c3dc998b..28e74c366 100644 --- a/scripts/dev/contexts/root-context +++ b/scripts/dev/contexts/root-context @@ -120,7 +120,7 @@ export e2e_cloud_qa_baseurl_static_2="${OM_HOST}" export OLM_VERSION=v0.31.0 # Python version we use locally and in CI -export PYTHON_VERSION=3.13.7 +export PYTHON_VERSION=3.13.9 ## MCO export MDB_COMMUNITY_IMAGE=mongodb-community-server From 5b375ca6cd49ba047ea34f15dede5e8d0c84b558 Mon Sep 17 00:00:00 2001 From: Mircea Cosbuc Date: Fri, 21 Nov 2025 15:58:22 +0100 Subject: [PATCH 3/6] Use ubi9-micro base image for all containers --- .evergreen-functions.yml | 1 + build_info.json | 24 +++++++------- .../mongodb-enterprise-ops-manager/Dockerfile | 26 +--------------- docker/mongodb-kubernetes-database/Dockerfile | 30 +----------------- .../mongodb-kubernetes-init-appdb/Dockerfile | 6 +--- .../Dockerfile | 6 +--- .../Dockerfile | 3 -- docker/mongodb-kubernetes-operator/Dockerfile | 7 ----- release.json | 31 ------------------- 9 files changed, 17 insertions(+), 117 deletions(-) diff --git a/.evergreen-functions.yml b/.evergreen-functions.yml index a300a7735..4b0fd1572 100644 --- a/.evergreen-functions.yml +++ b/.evergreen-functions.yml @@ -36,6 +36,7 @@ variables: - otel_parent_id - otel_trace_id - registry + - REGISTRY - requester - task_name - triggered_by_git_tag diff --git a/build_info.json b/build_info.json index c1c28f6cb..9dbbf0f02 100644 --- a/build_info.json +++ b/build_info.json @@ -3,7 +3,7 @@ "operator": { "dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes"], "platforms": [ "linux/amd64" ] @@ -35,7 +35,7 @@ "operator-race": { "dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes"], "platforms": [ "linux/amd64" ] @@ -51,7 +51,7 @@ "init-database": { "dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-init-database"], "platforms": [ "linux/amd64" ] @@ -83,7 +83,7 @@ "init-appdb": { "dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-init-appdb"], "platforms": [ "linux/amd64" ] @@ -115,7 +115,7 @@ "init-ops-manager": { "dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-init-ops-manager"], "platforms": [ "linux/amd64" ] @@ -141,7 +141,7 @@ "database": { "dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-database"], "platforms": [ "linux/amd64" ] @@ -173,7 +173,7 @@ "meko-tests": { "dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-tests"], "platforms": [ "linux/amd64" ] @@ -301,7 +301,7 @@ "readiness-probe": { "dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-readinessprobe"], "platforms": [ "linux/amd64" ] @@ -331,7 +331,7 @@ "upgrade-hook": { "dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile", "patch": { - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-kubernetes-operator-version-upgrade-post-start-hook"], "platforms": [ "linux/amd64" ] @@ -359,8 +359,8 @@ "agent": { "dockerfile-path": "docker/mongodb-agent/Dockerfile", "patch": { - "skip-if-exists": true, - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent"], + "skip-if-exists": false, + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-agent"], "platforms": [ "linux/amd64" ] @@ -393,7 +393,7 @@ "dockerfile-path": "docker/mongodb-enterprise-ops-manager/Dockerfile", "patch": { "skip-if-exists": true, - "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager-ubi"], + "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/mcosbuc/mongodb-enterprise-ops-manager-ubi"], "platforms": [ "linux/amd64" ] diff --git a/docker/mongodb-enterprise-ops-manager/Dockerfile b/docker/mongodb-enterprise-ops-manager/Dockerfile index 0ba6b4a71..7739620e6 100644 --- a/docker/mongodb-enterprise-ops-manager/Dockerfile +++ b/docker/mongodb-enterprise-ops-manager/Dockerfile @@ -19,7 +19,7 @@ COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-enterprise-ops-manager -FROM registry.access.redhat.com/ubi9/ubi-micro +FROM quay.io/mircea_cosbuc/ubi-micro-opsmanager-base ARG version ARG om_download_url @@ -43,30 +43,6 @@ EXPOSE 8080 # OpsManager docker image needs to have the MongoDB dependencies because the # backup daemon is running its database locally -# Replace libcurl-minimal and curl-minimal with the full versions -# https://bugzilla.redhat.com/show_bug.cgi?id=1994521 -RUN microdnf install -y libssh libpsl libbrotli \ - && microdnf download curl libcurl \ - && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \ - && microdnf remove -y libcurl-minimal curl-minimal - -RUN microdnf install --disableplugin=subscription-manager -y \ - cyrus-sasl \ - cyrus-sasl-gssapi \ - cyrus-sasl-plain \ - krb5-libs \ - libpcap \ - lm_sensors-libs \ - net-snmp \ - net-snmp-agent-libs \ - openldap \ - openssl \ - tar \ - rpm-libs \ - net-tools \ - procps-ng \ - ncurses - COPY --from=base /data/licenses /licenses/ COPY --from=base /data/scripts /opt/scripts diff --git a/docker/mongodb-kubernetes-database/Dockerfile b/docker/mongodb-kubernetes-database/Dockerfile index a9e58850f..ba84b2efe 100644 --- a/docker/mongodb-kubernetes-database/Dockerfile +++ b/docker/mongodb-kubernetes-database/Dockerfile @@ -2,39 +2,11 @@ FROM scratch AS base COPY ./docker/mongodb-kubernetes-database/LICENSE /data/licenses/mongodb-kubernetes-database -FROM registry.access.redhat.com/ubi8/ubi-micro +FROM quay.io/mircea_cosbuc/ubi-micro-database-base ENV MMS_HOME=/mongodb-automation ENV MMS_LOG_DIR=/var/log/mongodb-mms-automation -RUN microdnf update -y && rm -rf /var/cache/yum - -# these are the packages needed for the agent -RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper -RUN microdnf install -y --disableplugin=subscription-manager \ - hostname \ - procps - -# these are the packages needed for MongoDB -# (https://docs.mongodb.com/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/ "RHEL/CentOS 8" tab) -RUN microdnf install -y --disableplugin=subscription-manager \ - cyrus-sasl \ - cyrus-sasl-gssapi \ - cyrus-sasl-plain \ - krb5-libs \ - libcurl \ - lm_sensors-libs \ - net-snmp \ - net-snmp-agent-libs \ - openldap \ - openssl \ - jq \ - tar \ - xz-libs \ - findutils - -RUN ln -s /usr/lib64/libsasl2.so.3 /usr/lib64/libsasl2.so.2 - # Set the required perms RUN mkdir -p "${MMS_LOG_DIR}" \ && chmod 0775 "${MMS_LOG_DIR}" \ diff --git a/docker/mongodb-kubernetes-init-appdb/Dockerfile b/docker/mongodb-kubernetes-init-appdb/Dockerfile index 7a45e7dae..30e6e3b7a 100644 --- a/docker/mongodb-kubernetes-init-appdb/Dockerfile +++ b/docker/mongodb-kubernetes-init-appdb/Dockerfile @@ -53,7 +53,7 @@ COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/s COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/ -FROM registry.access.redhat.com/ubi8/ubi-micro +FROM quay.io/mircea_cosbuc/ubi-micro-init-database-base # Copy the extracted tools from the downloader stage (tools are already extracted there) COPY --from=tools_downloader /tools/ /tools/ @@ -64,10 +64,6 @@ COPY --from=base /data/scripts/ /scripts/ COPY --from=base /data/licenses /licenses/ COPY --from=base /data/version-upgrade-hook /probes/version-upgrade-hook -RUN microdnf -y update --nodocs \ - && microdnf -y install --nodocs tar gzip \ - && microdnf clean all - ARG version LABEL name="MongoDB Kubernetes Init AppDB" \ version="mongodb-kubernetes-init-appdb-${version}" \ diff --git a/docker/mongodb-kubernetes-init-database/Dockerfile b/docker/mongodb-kubernetes-init-database/Dockerfile index 9a0b009fd..e5a9b9ad0 100644 --- a/docker/mongodb-kubernetes-init-database/Dockerfile +++ b/docker/mongodb-kubernetes-init-database/Dockerfile @@ -53,7 +53,7 @@ COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/s COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/ -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM quay.io/mircea_cosbuc/ubi-micro-init-database-base # Copy the extracted tools from the downloader stage (tools are already extracted there) COPY --from=tools_downloader /tools/ /tools/ @@ -63,10 +63,6 @@ COPY --from=base /data/probe.sh /probes/probe.sh COPY --from=base /data/scripts/ /scripts/ COPY --from=base /data/licenses /licenses/ -RUN microdnf -y update --nodocs \ - && microdnf -y install --nodocs tar gzip \ - && microdnf clean all - ARG version LABEL name="MongoDB Kubernetes Init Database" \ version="mongodb-kubernetes-init-database-${version}" \ diff --git a/docker/mongodb-kubernetes-init-ops-manager/Dockerfile b/docker/mongodb-kubernetes-init-ops-manager/Dockerfile index 9814b8282..fd5d3e703 100644 --- a/docker/mongodb-kubernetes-init-ops-manager/Dockerfile +++ b/docker/mongodb-kubernetes-init-ops-manager/Dockerfile @@ -27,8 +27,5 @@ LABEL name="MongoDB Kubernetes Ops Manager Init" \ COPY --from=base /data/scripts /scripts COPY --from=base /data/licenses /licenses -RUN microdnf -y update --nodocs \ - && microdnf clean all - USER 2000 ENTRYPOINT [ "/bin/cp", "-f", "/scripts/docker-entry-point.sh", "/scripts/backup-daemon-liveness-probe.sh", "/scripts/mmsconfiguration", "/scripts/backup-daemon-readiness-probe", "/opt/scripts/" ] diff --git a/docker/mongodb-kubernetes-operator/Dockerfile b/docker/mongodb-kubernetes-operator/Dockerfile index 053e1a574..5e02275f5 100644 --- a/docker/mongodb-kubernetes-operator/Dockerfile +++ b/docker/mongodb-kubernetes-operator/Dockerfile @@ -46,13 +46,6 @@ ADD docker/mongodb-kubernetes-operator/licenses /data/licenses/ FROM registry.access.redhat.com/ubi9/ubi-micro -# Building an UBI-based image: https://red.ht/3n6b9y0 -RUN microdnf update \ - --disableplugin=subscription-manager \ - --disablerepo=* --enablerepo=ubi-9-appstream-rpms --enablerepo=ubi-9-baseos-rpms -y \ - && rm -rf /var/cache/yum -RUN microdnf install -y glibc-langpack-en - COPY --from=base /data/mongodb-kubernetes-operator /usr/local/bin/mongodb-kubernetes-operator COPY --from=base /data/om_version_mapping.json /usr/local/om_version_mapping.json COPY --from=base /data/licenses /licenses/ diff --git a/release.json b/release.json index 72e52f9cc..e54374e8f 100644 --- a/release.json +++ b/release.json @@ -23,19 +23,12 @@ "6.0.26", "6.0.27", "7.0.11", - "7.0.12", "7.0.13", "7.0.14", "7.0.15", "7.0.17", "7.0.18", "7.0.19", - "8.0.0", - "8.0.1", - "8.0.2", - "8.0.3", - "8.0.4", - "8.0.5", "8.0.6", "8.0.7", "8.0.11", @@ -105,10 +98,6 @@ "agent_version": "12.0.35.7911-1", "tools_version": "100.10.0" }, - "7.0.12": { - "agent_version": "107.0.12.8669-1", - "tools_version": "100.10.0" - }, "7.0.13": { "agent_version": "107.0.13.8702-1", "tools_version": "100.10.0" @@ -133,26 +122,6 @@ "agent_version": "107.0.19.8805-1", "tools_version": "100.13.0" }, - "8.0.1": { - "agent_version": "108.0.1.8718-1", - "tools_version": "100.10.0" - }, - "8.0.2": { - "agent_version": "108.0.2.8729-1", - "tools_version": "100.10.0" - }, - "8.0.3": { - "agent_version": "108.0.3.8758-1", - "tools_version": "100.10.0" - }, - "8.0.4": { - "agent_version": "108.0.4.8770-1", - "tools_version": "100.11.0" - }, - "8.0.5": { - "agent_version": "108.0.4.8770-1", - "tools_version": "100.11.0" - }, "8.0.6": { "agent_version": "108.0.6.8796-1", "tools_version": "100.11.0" From f2d7ae777b9b85ebdbe4824d6d8a5e325495461a Mon Sep 17 00:00:00 2001 From: Mircea Cosbuc Date: Fri, 21 Nov 2025 16:06:02 +0100 Subject: [PATCH 4/6] pre-commit changes --- config/manager/manager.yaml | 24 ------------------------ helm_chart/values-openshift.yaml | 12 ------------ public/mongodb-kubernetes-openshift.yaml | 24 ------------------------ 3 files changed, 60 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index adb403b37..b1663091c 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -130,8 +130,6 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.6.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_6_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.6.0" - - name: RELATED_IMAGE_AGENT_IMAGE_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:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1 @@ -142,8 +140,6 @@ spec: value: "quay.io/mongodb/mongodb-agent:107.0.18.8784-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_19_8805_1 value: "quay.io/mongodb/mongodb-agent:107.0.19.8805-1" - - name: RELATED_IMAGE_AGENT_IMAGE_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:108.0.11.8830-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 @@ -154,12 +150,6 @@ spec: value: "quay.io/mongodb/mongodb-agent:108.0.15.8888-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_16_8895_1 value: "quay.io/mongodb/mongodb-agent:108.0.16.8895-1" - - name: RELATED_IMAGE_AGENT_IMAGE_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:108.0.3.8758-1" - - name: RELATED_IMAGE_AGENT_IMAGE_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:108.0.6.8796-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1 @@ -174,8 +164,6 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.27" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_11 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.11" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_12 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.12" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_13 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.13" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_14 @@ -188,18 +176,6 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.18" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_19 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.19" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.1" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_2 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.2" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_3 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.3" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_4 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.4" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_5 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.5" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_6 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.6" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_7 diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml index 1a24fccc0..676fc1942 100644 --- a/helm_chart/values-openshift.yaml +++ b/helm_chart/values-openshift.yaml @@ -33,19 +33,12 @@ relatedImages: - 6.0.26 - 6.0.27 - 7.0.11 - - 7.0.12 - 7.0.13 - 7.0.14 - 7.0.15 - 7.0.17 - 7.0.18 - 7.0.19 - - 8.0.0 - - 8.0.1 - - 8.0.2 - - 8.0.3 - - 8.0.4 - - 8.0.5 - 8.0.6 - 8.0.7 - 8.0.11 @@ -105,21 +98,16 @@ relatedImages: - 8.0.0-ubi8 - 8.0.0-ubi9 agent: - - 107.0.12.8669-1 - 107.0.13.8702-1 - 107.0.15.8741-1 - 107.0.17.8771-1 - 107.0.18.8784-1 - 107.0.19.8805-1 - - 108.0.1.8718-1 - 108.0.11.8830-1 - 108.0.12.8846-1 - 108.0.13.8870-1 - 108.0.15.8888-1 - 108.0.16.8895-1 - - 108.0.2.8729-1 - - 108.0.3.8758-1 - - 108.0.4.8770-1 - 108.0.6.8796-1 - 108.0.7.8810-1 - 12.0.35.7911-1 diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml index 33ef2fa0b..42bacde01 100644 --- a/public/mongodb-kubernetes-openshift.yaml +++ b/public/mongodb-kubernetes-openshift.yaml @@ -434,8 +434,6 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.6.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_6_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.6.0" - - name: RELATED_IMAGE_AGENT_IMAGE_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:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1 @@ -446,8 +444,6 @@ spec: value: "quay.io/mongodb/mongodb-agent:107.0.18.8784-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_19_8805_1 value: "quay.io/mongodb/mongodb-agent:107.0.19.8805-1" - - name: RELATED_IMAGE_AGENT_IMAGE_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:108.0.11.8830-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 @@ -458,12 +454,6 @@ spec: value: "quay.io/mongodb/mongodb-agent:108.0.15.8888-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_16_8895_1 value: "quay.io/mongodb/mongodb-agent:108.0.16.8895-1" - - name: RELATED_IMAGE_AGENT_IMAGE_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:108.0.3.8758-1" - - name: RELATED_IMAGE_AGENT_IMAGE_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:108.0.6.8796-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1 @@ -478,8 +468,6 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.27" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_11 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.11" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_12 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.12" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_13 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.13" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_14 @@ -492,18 +480,6 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.18" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_19 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.19" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.1" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_2 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.2" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_3 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.3" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_4 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.4" - - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_5 - value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.5" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_6 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.6" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_7 From ec8d5797d229dade848f63d0f9ef1a11a3a17fd5 Mon Sep 17 00:00:00 2001 From: Mircea Cosbuc Date: Mon, 24 Nov 2025 13:01:59 +0100 Subject: [PATCH 5/6] Create base image for operator as well --- docker/mongodb-kubernetes-operator/Dockerfile | 2 +- scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa | 4 ++-- scripts/dev/contexts/variables/om80 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/mongodb-kubernetes-operator/Dockerfile b/docker/mongodb-kubernetes-operator/Dockerfile index 5e02275f5..829cc242a 100644 --- a/docker/mongodb-kubernetes-operator/Dockerfile +++ b/docker/mongodb-kubernetes-operator/Dockerfile @@ -44,7 +44,7 @@ COPY --from=builder /data/om_version_mapping.json /data/om_version_mapping.json ADD docker/mongodb-kubernetes-operator/licenses /data/licenses/ -FROM registry.access.redhat.com/ubi9/ubi-micro +FROM podman pull quay.io/mircea_cosbuc/ubi-micro-operator-base COPY --from=base /data/mongodb-kubernetes-operator /usr/local/bin/mongodb-kubernetes-operator COPY --from=base /data/om_version_mapping.json /usr/local/om_version_mapping.json diff --git a/scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa b/scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa index 923fa5c33..dbefcdbeb 100644 --- a/scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa +++ b/scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa @@ -14,7 +14,7 @@ export OPS_MANAGER_REGISTRY="${REGISTRY}" CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${PROJECT_DIR}"/.evergreen.yml | awk '{print $3}') export CUSTOM_OM_VERSION -export CUSTOM_MDB_VERSION=6.0.5 -export CUSTOM_MDB_PREV_VERSION=5.0.7 +export CUSTOM_MDB_VERSION=8.0.15 +export CUSTOM_MDB_PREV_VERSION=7.0.26 source "${script_dir}/variables/mongodb_search_dev" diff --git a/scripts/dev/contexts/variables/om80 b/scripts/dev/contexts/variables/om80 index 606362ba7..6a6790088 100644 --- a/scripts/dev/contexts/variables/om80 +++ b/scripts/dev/contexts/variables/om80 @@ -10,7 +10,7 @@ export CUSTOM_OM_VERSION export CUSTOM_MDB_VERSION=8.0.6 export CUSTOM_MDB_PREV_VERSION=7.0.18 -export AGENT_VERSION=108.0.1.8718-1 +export AGENT_VERSION=108.0.16.8895-1 export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}" export CUSTOM_APPDB_VERSION=8.0.6-ent From 2667583d3fb5f60e440122025ba2413db179fc7f Mon Sep 17 00:00:00 2001 From: Mircea Cosbuc Date: Mon, 24 Nov 2025 16:47:11 +0100 Subject: [PATCH 6/6] Fix FROM statement in operator image --- docker/mongodb-kubernetes-operator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mongodb-kubernetes-operator/Dockerfile b/docker/mongodb-kubernetes-operator/Dockerfile index 829cc242a..0e82af6ec 100644 --- a/docker/mongodb-kubernetes-operator/Dockerfile +++ b/docker/mongodb-kubernetes-operator/Dockerfile @@ -44,7 +44,7 @@ COPY --from=builder /data/om_version_mapping.json /data/om_version_mapping.json ADD docker/mongodb-kubernetes-operator/licenses /data/licenses/ -FROM podman pull quay.io/mircea_cosbuc/ubi-micro-operator-base +FROM quay.io/mircea_cosbuc/ubi-micro-operator-base COPY --from=base /data/mongodb-kubernetes-operator /usr/local/bin/mongodb-kubernetes-operator COPY --from=base /data/om_version_mapping.json /usr/local/om_version_mapping.json