Skip to content

Commit 2c19908

Browse files
m1kolam1kola
authored
Release MCK 1.6.1 (#644)
Preparation for the MCK 1.6.1 release. Public Dockerfiles for the Ops Manager and have already been merged in #643.
1 parent e800ca8 commit 2c19908

File tree

14 files changed

+400
-55
lines changed

14 files changed

+400
-55
lines changed

‎config/manager/manager.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
serviceAccountName: mongodb-kubernetes-operator
2323
containers:
2424
- name: mongodb-kubernetes-operator
25-
image: "quay.io/mongodb/mongodb-kubernetes:1.6.0"
25+
image: "quay.io/mongodb/mongodb-kubernetes:1.6.1"
2626
imagePullPolicy: Always
2727
args:
2828
- -watch-resource=mongodb
@@ -69,21 +69,21 @@ spec:
6969
- name: INIT_DATABASE_IMAGE_REPOSITORY
7070
value: quay.io/mongodb/mongodb-kubernetes-init-database
7171
- name: INIT_DATABASE_VERSION
72-
value: "1.6.0"
72+
value: "1.6.1"
7373
- name: DATABASE_VERSION
74-
value: "1.6.0"
74+
value: "1.6.1"
7575
# Ops Manager
7676
- name: OPS_MANAGER_IMAGE_REPOSITORY
7777
value: quay.io/mongodb/mongodb-enterprise-ops-manager-ubi
7878
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
7979
value: quay.io/mongodb/mongodb-kubernetes-init-ops-manager
8080
- name: INIT_OPS_MANAGER_VERSION
81-
value: "1.6.0"
81+
value: "1.6.1"
8282
# AppDB
8383
- name: INIT_APPDB_IMAGE_REPOSITORY
8484
value: quay.io/mongodb/mongodb-kubernetes-init-appdb
8585
- name: INIT_APPDB_VERSION
86-
value: "1.6.0"
86+
value: "1.6.1"
8787
- name: OPS_MANAGER_IMAGE_PULL_POLICY
8888
value: Always
8989
- name: AGENT_IMAGE
@@ -120,14 +120,14 @@ spec:
120120
- name: MDB_COMMUNITY_IMAGE_TYPE
121121
value: "ubi8"
122122
# Community Env Vars End
123-
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_6_0
124-
value: "quay.io/mongodb/mongodb-kubernetes-database:1.6.0"
125-
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_6_0
126-
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.6.0"
127-
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_6_0
128-
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.6.0"
129-
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_6_0
130-
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.6.0"
123+
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_6_1
124+
value: "quay.io/mongodb/mongodb-kubernetes-database:1.6.1"
125+
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_6_1
126+
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.6.1"
127+
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_6_1
128+
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.6.1"
129+
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_6_1
130+
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.6.1"
131131
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
132132
value: "quay.io/mongodb/mongodb-agent:107.0.12.8669-1"
133133
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1

‎config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
capabilities: Deep Insights
1313
categories: Database
1414
certified: "true"
15-
containerImage: quay.io/mongodb/mongodb-kubernetes:1.6.0
15+
containerImage: quay.io/mongodb/mongodb-kubernetes:1.6.1
1616
createdAt: ""
1717
description: The MongoDB Controllers for Kubernetes enable easy deploys of
1818
MongoDB into Kubernetes clusters, using our management, monitoring and
@@ -462,5 +462,5 @@ spec:
462462
maturity: stable
463463
provider:
464464
name: MongoDB, Inc
465-
replaces: mongodb-kubernetes.v1.5.0
465+
replaces: mongodb-kubernetes.v1.6.0
466466
version: 0.0.0

‎helm_chart/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |
44
MongoDB Controllers for Kubernetes translate the human knowledge of
55
creating a MongoDB instance into a scalable, repeatable, and standardized
66
method.
7-
version: 1.6.0
7+
version: 1.6.1
88
kubeVersion: '>=1.16-0'
99
type: application
1010
keywords:

‎helm_chart/values-openshift.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ operator:
2727
# Environment variables prefixed with RELATED_IMAGE_ are used by operator-sdk to generate relatedImages section
2828
# with sha256 digests pinning for the certified operator bundle with disconnected environment feature enabled.
2929
# https://docs.openshift.com/container-platform/4.14/operators/operator_sdk/osdk-generating-csvs.html#olm-enabling-operator-for-restricted-network_osdk-generating-csvs
30-
version: 1.6.0
30+
version: 1.6.1
3131
relatedImages:
3232
opsManager:
3333
- 6.0.26

‎helm_chart/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ operator:
2222
deployment_name: mongodb-kubernetes-operator
2323

2424
# Version of mongodb-kubernetes-operator
25-
version: 1.6.0
25+
version: 1.6.1
2626

2727
# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
2828
watchedResources:
@@ -129,24 +129,24 @@ operator:
129129
## Database
130130
database:
131131
name: mongodb-kubernetes-database
132-
version: 1.6.0
132+
version: 1.6.1
133133

134134
initDatabase:
135135
name: mongodb-kubernetes-init-database
136-
version: 1.6.0
136+
version: 1.6.1
137137

138138
## Ops Manager
139139
opsManager:
140140
name: mongodb-enterprise-ops-manager-ubi
141141

142142
initOpsManager:
143143
name: mongodb-kubernetes-init-ops-manager
144-
version: 1.6.0
144+
version: 1.6.1
145145

146146
## Application Database
147147
initAppDb:
148148
name: mongodb-kubernetes-init-appdb
149-
version: 1.6.0
149+
version: 1.6.1
150150

151151
agent:
152152
name: mongodb-agent

‎public/dockerfiles/mongodb-kubernetes-database/1.6.1/ubi/Dockerfile‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
FROM scratch AS base
2+
3+
COPY ./docker/mongodb-kubernetes-database/LICENSE /data/licenses/mongodb-kubernetes-database
4+
5+
FROM registry.access.redhat.com/ubi8/ubi-minimal
6+
7+
ENV MMS_HOME=/mongodb-automation
8+
ENV MMS_LOG_DIR=/var/log/mongodb-mms-automation
9+
10+
RUN microdnf update -y && rm -rf /var/cache/yum
11+
12+
# these are the packages needed for the agent
13+
RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
14+
RUN microdnf install -y --disableplugin=subscription-manager \
15+
hostname \
16+
procps
17+
18+
# these are the packages needed for MongoDB
19+
# (https://docs.mongodb.com/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/ "RHEL/CentOS 8" tab)
20+
RUN microdnf install -y --disableplugin=subscription-manager \
21+
cyrus-sasl \
22+
cyrus-sasl-gssapi \
23+
cyrus-sasl-plain \
24+
krb5-libs \
25+
libcurl \
26+
lm_sensors-libs \
27+
net-snmp \
28+
net-snmp-agent-libs \
29+
openldap \
30+
openssl \
31+
jq \
32+
tar \
33+
xz-libs \
34+
findutils
35+
36+
RUN ln -s /usr/lib64/libsasl2.so.3 /usr/lib64/libsasl2.so.2
37+
38+
# Set the required perms
39+
RUN mkdir -p "${MMS_LOG_DIR}" \
40+
&& chmod 0775 "${MMS_LOG_DIR}" \
41+
&& mkdir -p /var/lib/mongodb-mms-automation \
42+
&& chmod 0775 /var/lib/mongodb-mms-automation \
43+
&& mkdir -p /data \
44+
&& chmod 0775 /data \
45+
&& mkdir -p /journal \
46+
&& chmod 0775 /journal \
47+
&& mkdir -p "${MMS_HOME}" \
48+
&& chmod -R 0775 "${MMS_HOME}"
49+
50+
ARG version
51+
52+
LABEL name="MongoDB Kubernetes Database" \
53+
version="${version}" \
54+
summary="MongoDB Kubernetes Database Image" \
55+
description="MongoDB Kubernetes Database Image" \
56+
vendor="MongoDB" \
57+
release="1" \
58+
maintainer="[email protected]"
59+
60+
# USER needs to be set for this image to pass RedHat verification. Some customers have these requirements as well
61+
# It does not matter what number it is, as long as it is set to something.
62+
# However, OpenShift will run the container as a random user,
63+
# and the number in this configuration is not relevant.
64+
USER 2000
65+
66+
# The docker image doesn't have any scripts so by default does nothing
67+
# The script will be copied in runtime from init containers and the operator is expected
68+
# to override the COMMAND
69+
ENTRYPOINT ["sleep infinity"]
70+
71+
COPY --from=base /data/licenses/mongodb-kubernetes-database /licenses/mongodb-kubernetes-database

‎public/dockerfiles/mongodb-kubernetes-init-appdb/1.6.1/ubi/Dockerfile‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi8/ubi-minimal AS tools_downloader
2+
3+
ARG mongodb_tools_url
4+
ARG mongodb_tools_version_s390x
5+
ARG mongodb_tools_version_ppc64le
6+
ARG mongodb_tools_version_amd64
7+
ARG mongodb_tools_version_arm64
8+
9+
RUN microdnf -y update --nodocs \
10+
&& microdnf -y install --nodocs tar gzip curl \
11+
&& microdnf clean all
12+
13+
RUN case ${TARGETPLATFORM} in \
14+
"linux/amd64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_amd64} ;; \
15+
"linux/arm64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_arm64} ;; \
16+
"linux/s390x") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_s390x} ;; \
17+
"linux/ppc64le") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_ppc64le} ;; \
18+
esac \
19+
&& mkdir -p /tools \
20+
&& if [ -n "$MONGODB_TOOLS_VERSION" ]; then \
21+
curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"; \
22+
fi
23+
24+
RUN if [ -f "/tools/mongodb_tools.tgz" ]; then \
25+
tar xfz /tools/mongodb_tools.tgz --directory /tools \
26+
&& rm /tools/mongodb_tools.tgz; \
27+
fi
28+
29+
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.24 AS readiness_builder
30+
31+
WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes/
32+
33+
COPY go.mod go.sum ./
34+
35+
RUN go mod download
36+
37+
COPY mongodb-community-operator ./mongodb-community-operator
38+
39+
ARG TARGETOS
40+
ARG TARGETARCH
41+
RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
42+
RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
43+
44+
FROM scratch AS base
45+
46+
COPY --from=readiness_builder /readinessprobe /data/readinessprobe
47+
COPY --from=readiness_builder /version-upgrade-hook /data/version-upgrade-hook
48+
49+
COPY ./docker/mongodb-kubernetes-init-database/content/probe.sh /data/probe.sh
50+
51+
COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh /data/scripts/
52+
COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/scripts/
53+
54+
COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/
55+
56+
FROM registry.access.redhat.com/ubi8/ubi-minimal
57+
58+
# Copy the extracted tools from the downloader stage (tools are already extracted there)
59+
COPY --from=tools_downloader /tools/ /tools/
60+
61+
COPY --from=base /data/readinessprobe /probes/readinessprobe
62+
COPY --from=base /data/probe.sh /probes/probe.sh
63+
COPY --from=base /data/scripts/ /scripts/
64+
COPY --from=base /data/licenses /licenses/
65+
COPY --from=base /data/version-upgrade-hook /probes/version-upgrade-hook
66+
67+
RUN microdnf -y update --nodocs \
68+
&& microdnf -y install --nodocs tar gzip \
69+
&& microdnf clean all
70+
71+
ARG version
72+
LABEL name="MongoDB Kubernetes Init AppDB" \
73+
version="mongodb-kubernetes-init-appdb-${version}" \
74+
summary="MongoDB Kubernetes AppDB Init Image" \
75+
description="Startup Scripts for MongoDB Enterprise Application Database for Ops Manager" \
76+
release="1" \
77+
vendor="MongoDB" \
78+
maintainer="[email protected]"
79+
80+
USER 2000
81+
82+
ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]

‎public/dockerfiles/mongodb-kubernetes-init-database/1.6.1/ubi/Dockerfile‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi8/ubi-minimal AS tools_downloader
2+
3+
ARG mongodb_tools_url
4+
ARG mongodb_tools_version_s390x
5+
ARG mongodb_tools_version_ppc64le
6+
ARG mongodb_tools_version_amd64
7+
ARG mongodb_tools_version_arm64
8+
9+
RUN microdnf -y update --nodocs \
10+
&& microdnf -y install --nodocs tar gzip curl \
11+
&& microdnf clean all
12+
13+
RUN case ${TARGETPLATFORM} in \
14+
"linux/amd64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_amd64} ;; \
15+
"linux/arm64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_arm64} ;; \
16+
"linux/s390x") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_s390x} ;; \
17+
"linux/ppc64le") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_ppc64le} ;; \
18+
esac \
19+
&& mkdir -p /tools \
20+
&& if [ -n "$MONGODB_TOOLS_VERSION" ]; then \
21+
curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"; \
22+
fi
23+
24+
RUN if [ -f "/tools/mongodb_tools.tgz" ]; then \
25+
tar xfz /tools/mongodb_tools.tgz --directory /tools \
26+
&& rm /tools/mongodb_tools.tgz; \
27+
fi
28+
29+
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.24 AS readiness_builder
30+
31+
WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes/
32+
33+
COPY go.mod go.sum ./
34+
35+
RUN go mod download
36+
37+
COPY mongodb-community-operator ./mongodb-community-operator
38+
39+
ARG TARGETOS
40+
ARG TARGETARCH
41+
RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
42+
RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
43+
44+
FROM scratch AS base
45+
46+
COPY --from=readiness_builder /readinessprobe /data/readinessprobe
47+
COPY --from=readiness_builder /version-upgrade-hook /data/version-upgrade-hook
48+
49+
COPY ./docker/mongodb-kubernetes-init-database/content/probe.sh /data/probe.sh
50+
51+
COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh /data/scripts/
52+
COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/scripts/
53+
54+
COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/
55+
56+
FROM registry.access.redhat.com/ubi8/ubi-minimal
57+
58+
# Copy the extracted tools from the downloader stage (tools are already extracted there)
59+
COPY --from=tools_downloader /tools/ /tools/
60+
61+
COPY --from=base /data/readinessprobe /probes/readinessprobe
62+
COPY --from=base /data/probe.sh /probes/probe.sh
63+
COPY --from=base /data/scripts/ /scripts/
64+
COPY --from=base /data/licenses /licenses/
65+
66+
RUN microdnf -y update --nodocs \
67+
&& microdnf -y install --nodocs tar gzip \
68+
&& microdnf clean all
69+
70+
ARG version
71+
LABEL name="MongoDB Kubernetes Init Database" \
72+
version="mongodb-kubernetes-init-database-${version}" \
73+
summary="MongoDB Kubernetes Database Init Image" \
74+
description="Startup Scripts for MongoDB Enterprise Database" \
75+
release="1" \
76+
vendor="MongoDB" \
77+
maintainer="[email protected]"
78+
79+
USER 2000
80+
81+
ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]

0 commit comments

Comments
 (0)