Skip to content

Commit 3c7d0de

Browse files
chattonchatton
authored
Updates yaml files for release 1.15.0 (#214)
1 parent a444209 commit 3c7d0de

File tree

13 files changed

+452
-55
lines changed

13 files changed

+452
-55
lines changed

‎crds.yaml‎

Lines changed: 69 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -581,21 +581,25 @@ spec:
581581
created already.
582582
type: string
583583
enabled:
584-
description: Enables TLS for this resource. This will make
585-
the operator try to mount a Secret with a defined name (<resource-name>-cert).
586-
This is only used when enabling TLS on a MongoDB resource,
587-
and not on the AppDB, where TLS is configured by setting
588-
`secretRef.Name`.
584+
description: DEPRECATED please enable TLS by setting `security.certsSecretPrefix`
585+
or `security.tls.secretRef.prefix`. Enables TLS for this
586+
resource. This will make the operator try to mount a Secret
587+
with a defined name (<resource-name>-cert). This is only
588+
used when enabling TLS on a MongoDB resource, and not on
589+
the AppDB, where TLS is configured by setting `secretRef.Name`.
589590
type: boolean
590591
secretRef:
591-
description: SecretRef points to a Secret object containing
592-
the certificates to use when enabling TLS.
592+
description: DEPRECATED please use security.certsSecretPrefix
593+
instead SecretRef points to a Secret object containing the
594+
certificates to use when enabling TLS.
593595
properties:
594596
name:
595-
description: DEPRECATED please use security.tls.secretRef.prefix
597+
description: DEPRECATED please use security.certsSecretPrefix
596598
instead
597599
type: string
598600
prefix:
601+
description: DEPRECATED please use security.certsSecretPrefix
602+
instead
599603
type: string
600604
type: object
601605
type: object
@@ -1149,21 +1153,25 @@ spec:
11491153
created already.
11501154
type: string
11511155
enabled:
1152-
description: Enables TLS for this resource. This will make
1153-
the operator try to mount a Secret with a defined name (<resource-name>-cert).
1154-
This is only used when enabling TLS on a MongoDB resource,
1155-
and not on the AppDB, where TLS is configured by setting
1156-
`secretRef.Name`.
1156+
description: DEPRECATED please enable TLS by setting `security.certsSecretPrefix`
1157+
or `security.tls.secretRef.prefix`. Enables TLS for this
1158+
resource. This will make the operator try to mount a Secret
1159+
with a defined name (<resource-name>-cert). This is only
1160+
used when enabling TLS on a MongoDB resource, and not on
1161+
the AppDB, where TLS is configured by setting `secretRef.Name`.
11571162
type: boolean
11581163
secretRef:
1159-
description: SecretRef points to a Secret object containing
1160-
the certificates to use when enabling TLS.
1164+
description: DEPRECATED please use security.certsSecretPrefix
1165+
instead SecretRef points to a Secret object containing the
1166+
certificates to use when enabling TLS.
11611167
properties:
11621168
name:
1163-
description: DEPRECATED please use security.tls.secretRef.prefix
1169+
description: DEPRECATED please use security.certsSecretPrefix
11641170
instead
11651171
type: string
11661172
prefix:
1173+
description: DEPRECATED please use security.certsSecretPrefix
1174+
instead
11671175
type: string
11681176
type: object
11691177
type: object
@@ -1567,6 +1575,29 @@ spec:
15671575
type: string
15681576
type: object
15691577
type: object
1578+
automationConfig:
1579+
description: AutomationConfigOverride holds any fields that will
1580+
be merged on top of the Automation Config that the operator
1581+
creates for the AppDB. Currently only the process.disabled field
1582+
is recognized.
1583+
properties:
1584+
processes:
1585+
items:
1586+
description: OverrideProcess contains fields that we can
1587+
override on the AutomationConfig processes.
1588+
properties:
1589+
disabled:
1590+
type: boolean
1591+
name:
1592+
type: string
1593+
required:
1594+
- disabled
1595+
- name
1596+
type: object
1597+
type: array
1598+
required:
1599+
- processes
1600+
type: object
15701601
cloudManager:
15711602
properties:
15721603
configMapRef:
@@ -1903,21 +1934,26 @@ spec:
19031934
the certificates created already.
19041935
type: string
19051936
enabled:
1906-
description: Enables TLS for this resource. This will
1907-
make the operator try to mount a Secret with a defined
1908-
name (<resource-name>-cert). This is only used when
1909-
enabling TLS on a MongoDB resource, and not on the AppDB,
1910-
where TLS is configured by setting `secretRef.Name`.
1937+
description: DEPRECATED please enable TLS by setting `security.certsSecretPrefix`
1938+
or `security.tls.secretRef.prefix`. Enables TLS for
1939+
this resource. This will make the operator try to mount
1940+
a Secret with a defined name (<resource-name>-cert).
1941+
This is only used when enabling TLS on a MongoDB resource,
1942+
and not on the AppDB, where TLS is configured by setting
1943+
`secretRef.Name`.
19111944
type: boolean
19121945
secretRef:
1913-
description: SecretRef points to a Secret object containing
1946+
description: DEPRECATED please use security.certsSecretPrefix
1947+
instead SecretRef points to a Secret object containing
19141948
the certificates to use when enabling TLS.
19151949
properties:
19161950
name:
1917-
description: DEPRECATED please use security.tls.secretRef.prefix
1951+
description: DEPRECATED please use security.certsSecretPrefix
19181952
instead
19191953
type: string
19201954
prefix:
1955+
description: DEPRECATED please use security.certsSecretPrefix
1956+
instead
19211957
type: string
19221958
type: object
19231959
type: object
@@ -2038,6 +2074,16 @@ spec:
20382074
- name
20392075
type: object
20402076
type: array
2077+
queryableBackupSecretRef:
2078+
description: QueryableBackupSecretRef references the secret which
2079+
contains the pem file which is used for queryable backup. This
2080+
will be mounted into the Ops Manager pod.
2081+
properties:
2082+
name:
2083+
type: string
2084+
required:
2085+
- name
2086+
type: object
20412087
s3OpLogStores:
20422088
description: S3OplogStoreConfigs describes the list of s3 oplog
20432089
store configs used for backup.

‎dockerfiles/mongodb-agent/11.0.11.7036-1/ubi/Dockerfile‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
ARG imagebase
2+
FROM ${imagebase} as base
3+
4+
FROM registry.access.redhat.com/ubi8/ubi-minimal
5+
6+
ARG agent_version
7+
8+
LABEL name="MongoDB Agent" \
9+
version="${agent_version}" \
10+
summary="MongoDB Agent" \
11+
description="MongoDB Agent" \
12+
vendor="MongoDB" \
13+
release="1" \
14+
maintainer="support@mongodb.com"
15+
16+
RUN microdnf install -y --disableplugin=subscription-manager curl \
17+
hostname nss_wrapper tar gzip procps\
18+
&& microdnf upgrade -y \
19+
&& rm -rf /var/lib/apt/lists/*
20+
21+
RUN microdnf remove perl-IO-Socket-SSL
22+
RUN mkdir -p /agent \
23+
&& mkdir -p /var/lib/mongodb-mms-automation \
24+
&& mkdir -p /var/log/mongodb-mms-automation/ \
25+
&& chmod -R +wr /var/log/mongodb-mms-automation/ \
26+
# ensure that the agent user can write the logs in OpenShift
27+
&& touch /var/log/mongodb-mms-automation/readiness.log \
28+
&& chmod ugo+rw /var/log/mongodb-mms-automation/readiness.log
29+
30+
31+
COPY --from=base /data/mongodb-agent.tar.gz /agent
32+
COPY --from=base /data/mongodb-tools.tgz /agent
33+
COPY --from=base /data/LICENSE /licenses/LICENSE
34+
35+
RUN tar xfz /agent/mongodb-agent.tar.gz \
36+
&& mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent \
37+
&& chmod +x /agent/mongodb-agent \
38+
&& mkdir -p /var/lib/automation/config \
39+
&& chmod -R +r /var/lib/automation/config \
40+
&& rm /agent/mongodb-agent.tar.gz \
41+
&& rm -r mongodb-mms-automation-agent-*
42+
43+
RUN tar xfz /agent/mongodb-tools.tgz --directory /var/lib/mongodb-mms-automation/ && rm /agent/mongodb-tools.tgz
44+
45+
USER 2000
46+
CMD ["/agent/mongodb-agent", "-cluster=/var/lib/automation/config/automation-config.json"]

‎dockerfiles/mongodb-agent/11.0.11.7036-1/ubuntu/Dockerfile‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
ARG imagebase
2+
FROM ${imagebase} as base
3+
4+
FROM ubuntu:20.04
5+
6+
ARG agent_version
7+
8+
LABEL name="MongoDB Agent" \
9+
version="${agent_version}" \
10+
summary="MongoDB Agent" \
11+
description="MongoDB Agent" \
12+
vendor="MongoDB" \
13+
release="1" \
14+
maintainer="support@mongodb.com"
15+
16+
RUN apt-get -qq update \
17+
&& apt-get -y -qq install \
18+
curl \
19+
libnss-wrapper \
20+
&& apt-get upgrade -y -qq \
21+
&& apt-get dist-upgrade -y -qq \
22+
&& rm -rf /var/lib/apt/lists/*
23+
RUN mkdir -p /agent \
24+
&& mkdir -p /var/lib/mongodb-mms-automation \
25+
&& mkdir -p /var/log/mongodb-mms-automation/ \
26+
&& chmod -R +wr /var/log/mongodb-mms-automation/ \
27+
# ensure that the agent user can write the logs in OpenShift
28+
&& touch /var/log/mongodb-mms-automation/readiness.log \
29+
&& chmod ugo+rw /var/log/mongodb-mms-automation/readiness.log
30+
31+
32+
COPY --from=base /data/mongodb-agent.tar.gz /agent
33+
COPY --from=base /data/mongodb-tools.tgz /agent
34+
COPY --from=base /data/LICENSE /licenses/LICENSE
35+
36+
RUN tar xfz /agent/mongodb-agent.tar.gz \
37+
&& mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent \
38+
&& chmod +x /agent/mongodb-agent \
39+
&& mkdir -p /var/lib/automation/config \
40+
&& chmod -R +r /var/lib/automation/config \
41+
&& rm /agent/mongodb-agent.tar.gz \
42+
&& rm -r mongodb-mms-automation-agent-*
43+
44+
RUN tar xfz /agent/mongodb-tools.tgz --directory /var/lib/mongodb-mms-automation/ && rm /agent/mongodb-tools.tgz
45+
46+
USER 2000
47+
CMD ["/agent/mongodb-agent", "-cluster=/var/lib/automation/config/automation-config.json"]

‎dockerfiles/mongodb-enterprise-init-appdb/1.0.9/ubi/Dockerfile‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
ARG imagebase
2+
FROM ${imagebase} as base
3+
4+
FROM registry.access.redhat.com/ubi8/ubi-minimal
5+
6+
ARG version
7+
LABEL name="MongoDB Enterprise Init AppDB" \
8+
version="mongodb-enterprise-init-appdb-${version}" \
9+
summary="MongoDB Enterprise AppDB Init Image" \
10+
description="Startup Scripts for MongoDB Enterprise Application Database for Ops Manager" \
11+
release="1" \
12+
vendor="MongoDB" \
13+
maintainer="support@mongodb.com"
14+
15+
COPY --from=base /data/readinessprobe /probes/readinessprobe
16+
COPY --from=base /data/probe.sh /probes/probe.sh
17+
COPY --from=base /data/scripts/ /scripts/
18+
COPY --from=base /data/licenses /licenses/
19+
COPY --from=base /data/version-upgrade-hook /probes/version-upgrade-hook
20+
21+
22+
RUN microdnf update --nodocs \
23+
&& microdnf -y install --nodocs tar gzip \
24+
&& microdnf clean all
25+
26+
COPY --from=base /data/mongodb_tools_ubi.tgz /tools/mongodb_tools.tgz
27+
28+
29+
RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
30+
&& rm /tools/mongodb_tools.tgz
31+
32+
USER 2000
33+
ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
34+
35+

‎dockerfiles/mongodb-enterprise-init-appdb/1.0.9/ubuntu/Dockerfile‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
ARG imagebase
2+
FROM ${imagebase} as base
3+
4+
FROM busybox
5+
6+
ARG version
7+
LABEL name="MongoDB Enterprise Init AppDB" \
8+
version="mongodb-enterprise-init-appdb-${version}" \
9+
summary="MongoDB Enterprise AppDB Init Image" \
10+
description="Startup Scripts for MongoDB Enterprise Application Database for Ops Manager" \
11+
release="1" \
12+
vendor="MongoDB" \
13+
maintainer="support@mongodb.com"
14+
15+
COPY --from=base /data/readinessprobe /probes/readinessprobe
16+
COPY --from=base /data/probe.sh /probes/probe.sh
17+
COPY --from=base /data/scripts/ /scripts/
18+
COPY --from=base /data/licenses /licenses/
19+
COPY --from=base /data/version-upgrade-hook /probes/version-upgrade-hook
20+
21+
22+
COPY --from=base /data/mongodb_tools_ubuntu.tgz /tools/mongodb_tools.tgz
23+
24+
25+
RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
26+
&& rm /tools/mongodb_tools.tgz
27+
28+
USER 2000
29+
ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
30+
31+

‎dockerfiles/mongodb-enterprise-init-database/1.0.7/ubi/Dockerfile‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
ARG imagebase
2+
FROM ${imagebase} as base
3+
4+
FROM registry.access.redhat.com/ubi8/ubi-minimal
5+
6+
ARG version
7+
LABEL name="MongoDB Enterprise Init Database" \
8+
version="mongodb-enterprise-init-database-${version}" \
9+
summary="MongoDB Enterprise Database Init Image" \
10+
description="Startup Scripts for MongoDB Enterprise Database" \
11+
release="1" \
12+
vendor="MongoDB" \
13+
maintainer="support@mongodb.com"
14+
15+
COPY --from=base /data/readinessprobe /probes/readinessprobe
16+
COPY --from=base /data/probe.sh /probes/probe.sh
17+
COPY --from=base /data/scripts/ /scripts/
18+
COPY --from=base /data/licenses /licenses/
19+
20+
21+
RUN microdnf update --nodocs \
22+
&& microdnf -y install --nodocs tar gzip \
23+
&& microdnf clean all
24+
25+
COPY --from=base /data/mongodb_tools_ubi.tgz /tools/mongodb_tools.tgz
26+
27+
28+
RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
29+
&& rm /tools/mongodb_tools.tgz
30+
31+
USER 2000
32+
ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
33+
34+

‎dockerfiles/mongodb-enterprise-init-database/1.0.7/ubuntu/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
ARG imagebase
2+
FROM ${imagebase} as base
3+
4+
FROM busybox
5+
6+
ARG version
7+
LABEL name="MongoDB Enterprise Init Database" \
8+
version="mongodb-enterprise-init-database-${version}" \
9+
summary="MongoDB Enterprise Database Init Image" \
10+
description="Startup Scripts for MongoDB Enterprise Database" \
11+
release="1" \
12+
vendor="MongoDB" \
13+
maintainer="support@mongodb.com"
14+
15+
COPY --from=base /data/readinessprobe /probes/readinessprobe
16+
COPY --from=base /data/probe.sh /probes/probe.sh
17+
COPY --from=base /data/scripts/ /scripts/
18+
COPY --from=base /data/licenses /licenses/
19+
20+
21+
COPY --from=base /data/mongodb_tools_ubuntu.tgz /tools/mongodb_tools.tgz
22+
23+
24+
RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
25+
&& rm /tools/mongodb_tools.tgz
26+
27+
USER 2000
28+
ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
29+
30+

0 commit comments

Comments
 (0)