Skip to content

Commit b3bb7bb

Browse files
fealebenpaefealebenpae
authored
Release MCK 1.6.0 (#594)
# Summary <!-- Enter your issue summary here.--> ## Proof of Work <!-- Enter your proof that it works here.--> ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [ ] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details
1 parent 3b0c15c commit b3bb7bb

File tree

20 files changed

+1024
-55
lines changed

20 files changed

+1024
-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.5.0"
25+
image: "quay.io/mongodb/mongodb-kubernetes:1.6.0"
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.5.0"
72+
value: "1.6.0"
7373
- name: DATABASE_VERSION
74-
value: "1.5.0"
74+
value: "1.6.0"
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.5.0"
81+
value: "1.6.0"
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.5.0"
86+
value: "1.6.0"
8787
- name: OPS_MANAGER_IMAGE_PULL_POLICY
8888
value: Always
8989
- name: AGENT_IMAGE
@@ -122,14 +122,14 @@ spec:
122122
- name: MDB_COMMUNITY_IMAGE_TYPE
123123
value: "ubi8"
124124
# Community Env Vars End
125-
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_5_0
126-
value: "quay.io/mongodb/mongodb-kubernetes-database:1.5.0"
127-
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_5_0
128-
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.5.0"
129-
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_5_0
130-
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.5.0"
131-
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_5_0
132-
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.5.0"
125+
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_6_0
126+
value: "quay.io/mongodb/mongodb-kubernetes-database:1.6.0"
127+
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_6_0
128+
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.6.0"
129+
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_6_0
130+
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.6.0"
131+
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_6_0
132+
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.6.0"
133133
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
134134
value: "quay.io/mongodb/mongodb-agent:107.0.12.8669-1"
135135
- 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.5.0
15+
containerImage: quay.io/mongodb/mongodb-kubernetes:1.6.0
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.4.0
465+
replaces: mongodb-kubernetes.v1.5.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.5.0
7+
version: 1.6.0
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.5.0
30+
version: 1.6.0
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.5.0
25+
version: 1.6.0
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.5.0
132+
version: 1.6.0
133133

134134
initDatabase:
135135
name: mongodb-kubernetes-init-database
136-
version: 1.5.0
136+
version: 1.6.0
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.5.0
144+
version: 1.6.0
145145

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

151151
agent:
152152
name: mongodb-agent

‎public/dockerfiles/mongodb-agent/107.0.19.8805-1/ubi/Dockerfile‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS tools_downloader
2+
3+
ARG TARGETPLATFORM
4+
ARG mongodb_tools_url
5+
ARG mongodb_tools_version_s390x
6+
ARG mongodb_tools_version_ppc64le
7+
ARG mongodb_tools_version_amd64
8+
ARG mongodb_tools_version_arm64
9+
10+
RUN microdnf -y update --nodocs \
11+
&& microdnf -y install --nodocs tar gzip \
12+
&& microdnf clean all
13+
14+
RUN case ${TARGETPLATFORM} in \
15+
"linux/amd64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_amd64} ;; \
16+
"linux/arm64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_arm64} ;; \
17+
"linux/s390x") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_s390x} ;; \
18+
"linux/ppc64le") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_ppc64le} ;; \
19+
esac \
20+
&& mkdir -p /tools \
21+
&& curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"
22+
23+
RUN tar xfz /tools/mongodb_tools.tgz \
24+
&& mv mongodb-database-tools-*/bin/* /tools \
25+
&& chmod +x /tools/* \
26+
&& rm /tools/mongodb_tools.tgz \
27+
&& rm -r mongodb-database-tools-*
28+
29+
FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS agent_downloader
30+
31+
ARG TARGETPLATFORM
32+
ARG mongodb_agent_url
33+
ARG mongodb_agent_version_s390x
34+
ARG mongodb_agent_version_ppc64le
35+
ARG mongodb_agent_version_amd64
36+
ARG mongodb_agent_version_arm64
37+
38+
RUN microdnf -y update --nodocs \
39+
&& microdnf -y install --nodocs tar gzip \
40+
&& microdnf clean all
41+
42+
RUN case ${TARGETPLATFORM} in \
43+
"linux/amd64") export MONGODB_AGENT_VERSION=${mongodb_agent_version_amd64} ;; \
44+
"linux/arm64") export MONGODB_AGENT_VERSION=${mongodb_agent_version_arm64} ;; \
45+
"linux/s390x") export MONGODB_AGENT_VERSION=${mongodb_agent_version_s390x} ;; \
46+
"linux/ppc64le") export MONGODB_AGENT_VERSION=${mongodb_agent_version_ppc64le} ;; \
47+
esac \
48+
&& mkdir -p /agent \
49+
&& curl -o /agent/mongodb_agent.tgz "${mongodb_agent_url}/${MONGODB_AGENT_VERSION}"
50+
51+
RUN tar xfz /agent/mongodb_agent.tgz \
52+
&& mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent \
53+
&& chmod +x /agent/mongodb-agent \
54+
&& rm /agent/mongodb_agent.tgz \
55+
&& rm -r mongodb-mms-automation-agent-*
56+
57+
FROM registry.access.redhat.com/ubi9/ubi-minimal
58+
59+
# Replace libcurl-minimal and curl-minimal with the full versions
60+
# https://bugzilla.redhat.com/show_bug.cgi?id=1994521
61+
RUN microdnf install -y libssh libpsl libbrotli \
62+
&& microdnf download curl libcurl \
63+
&& rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \
64+
&& microdnf remove -y libcurl-minimal curl-minimal
65+
66+
RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
67+
# Copy-pasted from https://www.mongodb.com/docs/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/
68+
RUN microdnf install -y --disableplugin=subscription-manager \
69+
cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-plain krb5-libs openldap openssl xz-libs
70+
# Dependencies for the Agent
71+
RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 \
72+
net-snmp \
73+
net-snmp-agent-libs
74+
RUN microdnf install -y --disableplugin=subscription-manager \
75+
hostname tar gzip procps jq \
76+
&& microdnf upgrade -y \
77+
&& rm -rf /var/lib/apt/lists/*
78+
79+
RUN mkdir -p /agent \
80+
&& mkdir -p /var/lib/mongodb-mms-automation \
81+
&& mkdir -p /var/log/mongodb-mms-automation/ \
82+
&& chmod -R +wr /var/log/mongodb-mms-automation/ \
83+
# ensure that the agent user can write the logs in OpenShift
84+
&& touch /var/log/mongodb-mms-automation/readiness.log \
85+
&& chmod ugo+rw /var/log/mongodb-mms-automation/readiness.log
86+
87+
# Copy scripts to a safe location that won't be overwritten by volume mount
88+
COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /licenses/LICENSE
89+
COPY ./docker/mongodb-agent/agent-launcher-shim.sh /usr/local/bin/agent-launcher-shim.sh
90+
COPY ./docker/mongodb-agent/setup-agent-files.sh /usr/local/bin/setup-agent-files.sh
91+
COPY ./docker/mongodb-agent/dummy-probe.sh /usr/local/bin/dummy-probe.sh
92+
COPY ./docker/mongodb-agent/dummy-readinessprobe /usr/local/bin/dummy-readinessprobe
93+
94+
RUN mkdir -p /var/lib/automation/config \
95+
&& chmod -R +r /var/lib/automation/config
96+
97+
RUN mkdir -p /tools /agent
98+
99+
COPY --from=tools_downloader "/tools/" /tools/
100+
COPY --from=agent_downloader "/agent/" /agent/
101+
102+
ARG version
103+
104+
LABEL name="MongoDB Agent" \
105+
version="${version}" \
106+
summary="MongoDB Agent" \
107+
description="MongoDB Agent" \
108+
vendor="MongoDB" \
109+
release="1" \
110+
maintainer="[email protected]"
111+
112+
USER 2000
113+
CMD ["/agent/mongodb-agent", "-cluster=/var/lib/automation/config/automation-config.json"]

‎public/dockerfiles/mongodb-agent/108.0.15.8888-1/ubi/Dockerfile‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS tools_downloader
2+
3+
ARG TARGETPLATFORM
4+
ARG mongodb_tools_url
5+
ARG mongodb_tools_version_s390x
6+
ARG mongodb_tools_version_ppc64le
7+
ARG mongodb_tools_version_amd64
8+
ARG mongodb_tools_version_arm64
9+
10+
RUN microdnf -y update --nodocs \
11+
&& microdnf -y install --nodocs tar gzip \
12+
&& microdnf clean all
13+
14+
RUN case ${TARGETPLATFORM} in \
15+
"linux/amd64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_amd64} ;; \
16+
"linux/arm64") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_arm64} ;; \
17+
"linux/s390x") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_s390x} ;; \
18+
"linux/ppc64le") export MONGODB_TOOLS_VERSION=${mongodb_tools_version_ppc64le} ;; \
19+
esac \
20+
&& mkdir -p /tools \
21+
&& curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"
22+
23+
RUN tar xfz /tools/mongodb_tools.tgz \
24+
&& mv mongodb-database-tools-*/bin/* /tools \
25+
&& chmod +x /tools/* \
26+
&& rm /tools/mongodb_tools.tgz \
27+
&& rm -r mongodb-database-tools-*
28+
29+
FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS agent_downloader
30+
31+
ARG TARGETPLATFORM
32+
ARG mongodb_agent_url
33+
ARG mongodb_agent_version_s390x
34+
ARG mongodb_agent_version_ppc64le
35+
ARG mongodb_agent_version_amd64
36+
ARG mongodb_agent_version_arm64
37+
38+
RUN microdnf -y update --nodocs \
39+
&& microdnf -y install --nodocs tar gzip \
40+
&& microdnf clean all
41+
42+
RUN case ${TARGETPLATFORM} in \
43+
"linux/amd64") export MONGODB_AGENT_VERSION=${mongodb_agent_version_amd64} ;; \
44+
"linux/arm64") export MONGODB_AGENT_VERSION=${mongodb_agent_version_arm64} ;; \
45+
"linux/s390x") export MONGODB_AGENT_VERSION=${mongodb_agent_version_s390x} ;; \
46+
"linux/ppc64le") export MONGODB_AGENT_VERSION=${mongodb_agent_version_ppc64le} ;; \
47+
esac \
48+
&& mkdir -p /agent \
49+
&& curl -o /agent/mongodb_agent.tgz "${mongodb_agent_url}/${MONGODB_AGENT_VERSION}"
50+
51+
RUN tar xfz /agent/mongodb_agent.tgz \
52+
&& mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent \
53+
&& chmod +x /agent/mongodb-agent \
54+
&& rm /agent/mongodb_agent.tgz \
55+
&& rm -r mongodb-mms-automation-agent-*
56+
57+
FROM registry.access.redhat.com/ubi9/ubi-minimal
58+
59+
# Replace libcurl-minimal and curl-minimal with the full versions
60+
# https://bugzilla.redhat.com/show_bug.cgi?id=1994521
61+
RUN microdnf install -y libssh libpsl libbrotli \
62+
&& microdnf download curl libcurl \
63+
&& rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \
64+
&& microdnf remove -y libcurl-minimal curl-minimal
65+
66+
RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
67+
# Copy-pasted from https://www.mongodb.com/docs/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/
68+
RUN microdnf install -y --disableplugin=subscription-manager \
69+
cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-plain krb5-libs openldap openssl xz-libs
70+
# Dependencies for the Agent
71+
RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 \
72+
net-snmp \
73+
net-snmp-agent-libs
74+
RUN microdnf install -y --disableplugin=subscription-manager \
75+
hostname tar gzip procps jq \
76+
&& microdnf upgrade -y \
77+
&& rm -rf /var/lib/apt/lists/*
78+
79+
RUN mkdir -p /agent \
80+
&& mkdir -p /var/lib/mongodb-mms-automation \
81+
&& mkdir -p /var/log/mongodb-mms-automation/ \
82+
&& chmod -R +wr /var/log/mongodb-mms-automation/ \
83+
# ensure that the agent user can write the logs in OpenShift
84+
&& touch /var/log/mongodb-mms-automation/readiness.log \
85+
&& chmod ugo+rw /var/log/mongodb-mms-automation/readiness.log
86+
87+
# Copy scripts to a safe location that won't be overwritten by volume mount
88+
COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /licenses/LICENSE
89+
COPY ./docker/mongodb-agent/agent-launcher-shim.sh /usr/local/bin/agent-launcher-shim.sh
90+
COPY ./docker/mongodb-agent/setup-agent-files.sh /usr/local/bin/setup-agent-files.sh
91+
COPY ./docker/mongodb-agent/dummy-probe.sh /usr/local/bin/dummy-probe.sh
92+
COPY ./docker/mongodb-agent/dummy-readinessprobe /usr/local/bin/dummy-readinessprobe
93+
94+
RUN mkdir -p /var/lib/automation/config \
95+
&& chmod -R +r /var/lib/automation/config
96+
97+
RUN mkdir -p /tools /agent
98+
99+
COPY --from=tools_downloader "/tools/" /tools/
100+
COPY --from=agent_downloader "/agent/" /agent/
101+
102+
ARG version
103+
104+
LABEL name="MongoDB Agent" \
105+
version="${version}" \
106+
summary="MongoDB Agent" \
107+
description="MongoDB Agent" \
108+
vendor="MongoDB" \
109+
release="1" \
110+
maintainer="[email protected]"
111+
112+
USER 2000
113+
CMD ["/agent/mongodb-agent", "-cluster=/var/lib/automation/config/automation-config.json"]

0 commit comments

Comments
 (0)