Skip to content
Draft
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
1 change: 1 addition & 0 deletions .evergreen-functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ variables:
- otel_parent_id
- otel_trace_id
- registry
- REGISTRY
- requester
- task_name
- triggered_by_git_tag
Expand Down
24 changes: 12 additions & 12 deletions build_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand All @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand All @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
]
Expand Down
24 changes: 0 additions & 24 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
22 changes: 1 addition & 21 deletions docker/mongodb-agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-minimal

# 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 \
Expand Down
26 changes: 1 addition & 25 deletions docker/mongodb-enterprise-ops-manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 quay.io/mircea_cosbuc/ubi-micro-opsmanager-base

ARG version
ARG om_download_url
Expand All @@ -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

Expand Down
30 changes: 1 addition & 29 deletions docker/mongodb-kubernetes-database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-minimal
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}" \
Expand Down
6 changes: 1 addition & 5 deletions docker/mongodb-kubernetes-init-appdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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}" \
Expand Down
6 changes: 1 addition & 5 deletions docker/mongodb-kubernetes-init-database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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}" \
Expand Down
5 changes: 1 addition & 4 deletions docker/mongodb-kubernetes-init-ops-manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/" ]
9 changes: 1 addition & 8 deletions docker/mongodb-kubernetes-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +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

# 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
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
Expand Down
2 changes: 1 addition & 1 deletion docker/mongodb-kubernetes-readinessprobe/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker/mongodb-kubernetes-upgrade-hook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading