Merge branch 'master' into maciejk/ar-image-staging

Author: MaciejKaras

.gitignore

@@ -42,7 +42,6 @@ public/architectures/**/certs/*
 public/architectures/**/secrets/*
 
 docker/mongodb-kubernetes-appdb/content/readinessprobe
-mongodb-kubernetes
 docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator.tar
 docker/mongodb-kubernetes-tests/helm_chart/
 docker/mongodb-kubernetes-tests/public/

build_info.json

@@ -287,23 +287,23 @@
       "dockerfile-path": "docker/mongodb-enterprise-ops-manager/Dockerfile.atomic",
       "patch": {
         "version": "om-version-from-release.json",
-        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager"],
+        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager-ubi"],
         "platforms": [
           "linux/amd64"
         ]
       },
       "staging": {
         "version": "om-version-from-release.json",
         "sign": true,
-        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager"],
+        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager-ubi"],
         "platforms": [
           "linux/amd64"
         ]
       },
       "manual_release": {
         "sign": true,
         "olm-tag": true,
-        "repositories": ["quay.io/mongodb/mongodb-enterprise-ops-manager"],
+        "repositories": ["quay.io/mongodb/mongodb-enterprise-ops-manager-ubi"],
         "platforms": [
           "linux/amd64"
         ]

config/manager/manager.yaml

@@ -22,7 +22,7 @@ spec:
       serviceAccountName: mongodb-kubernetes-operator
       containers:
         - name: mongodb-kubernetes-operator
-          image: "quay.io/mongodb/mongodb-kubernetes:1.2.0"
+          image: "quay.io/mongodb/mongodb-kubernetes:1.3.0"
           imagePullPolicy: Always
           args:
             - -watch-resource=mongodb
@@ -69,21 +69,21 @@ spec:
             - name: INIT_DATABASE_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-kubernetes-init-database
             - name: INIT_DATABASE_VERSION
-              value: 1.2.0
+              value: 1.3.0
             - name: DATABASE_VERSION
-              value: 1.2.0
+              value: 1.3.0
             # Ops Manager
             - name: OPS_MANAGER_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-enterprise-ops-manager-ubi
             - name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-kubernetes-init-ops-manager
             - name: INIT_OPS_MANAGER_VERSION
-              value: 1.2.0
+              value: 1.3.0
             # AppDB
             - name: INIT_APPDB_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-kubernetes-init-appdb
             - name: INIT_APPDB_VERSION
-              value: 1.2.0
+              value: 1.3.0
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
@@ -122,14 +122,14 @@ spec:
             - name: MDB_COMMUNITY_IMAGE_TYPE
               value: "ubi8"
             # Community Env Vars End
-            - name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_2_0
-              value: "quay.io/mongodb/mongodb-kubernetes-database:1.2.0"
-            - name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_2_0
-              value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.2.0"
-            - name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_2_0
-              value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0"
-            - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
-              value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
+            - name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_3_0
+              value: "quay.io/mongodb/mongodb-kubernetes-database:1.3.0"
+            - name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_3_0
+              value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.3.0"
+            - name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_3_0
+              value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.3.0"
+            - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_3_0
+              value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.3.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
@@ -295,8 +295,6 @@ spec:
               value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi8"
             - name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
               value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
-            - name: RELATED_IMAGE_MDB_SEARCH_IMAGE_1_47_0
-              value: "quay.io/mongodb/mongodb-search-community:1.47.0"
             - name: MDB_SEARCH_COMMUNITY_REPO_URL
               value: "quay.io/mongodb"
             - name: MDB_SEARCH_COMMUNITY_NAME

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

@@ -6,7 +6,7 @@ metadata:
     capabilities: Deep Insights
     categories: Database
     certified: "true"
-    containerImage: quay.io/mongodb/mongodb-kubernetes:1.2.0
+    containerImage: quay.io/mongodb/mongodb-kubernetes:1.3.0
     createdAt: ""
     description: The MongoDB Controllers for Kubernetes enable easy deploys of 
       MongoDB into Kubernetes clusters, using our management, monitoring and 
@@ -456,5 +456,5 @@ spec:
   maturity: stable
   provider:
     name: MongoDB, Inc
-  replaces: mongodb-kubernetes.v1.1.0
+  replaces: mongodb-kubernetes.v1.2.0
   version: 0.0.0

docker/mongodb-agent/setup-agent-files.sh

@@ -8,8 +8,8 @@ SCRIPTS_DIR="/opt/scripts"
 # readiness always returns failure
 setup_dummy_probes() {
   echo "Setting up dummy probe scripts..."
-  cp /usr/local/bin/dummy-probe.sh "$SCRIPTS_DIR/probe.sh"
-  cp /usr/local/bin/dummy-readinessprobe "$SCRIPTS_DIR/readinessprobe"
+  cp --remove-destination /usr/local/bin/dummy-probe.sh "$SCRIPTS_DIR/probe.sh"
+  cp --remove-destination /usr/local/bin/dummy-readinessprobe "$SCRIPTS_DIR/readinessprobe"
   echo "Dummy probe scripts ready"
 }
 

helm_chart/Chart.yaml

@@ -3,7 +3,7 @@ name: mongodb-kubernetes
 description: MongoDB Controllers for Kubernetes translate the human knowledge of
   creating a MongoDB instance into a scalable, repeatable, and standardized 
   method.
-version: 1.2.0
+version: 1.3.0
 kubeVersion: '>=1.16-0'
 type: application
 keywords:

helm_chart/templates/operator.yaml

@@ -262,10 +262,6 @@ spec:
             - name: RELATED_IMAGE_{{ $mongodbImageEnv }}_{{ $version | replace "." "_" | replace "-" "_" }}
               value: "{{ $.Values.mongodb.repo }}/{{ $.Values.mongodb.name }}:{{ $version }}"
       {{- end }}
-      {{- if .Values.search }}
-            - name: RELATED_IMAGE_MDB_SEARCH_IMAGE_{{ .Values.search.community.version | replace "." "_" | replace "-" "_" }}
-              value: "{{ .Values.search.community.repo }}/{{ .Values.search.community.name }}:{{ $.Values.search.community.version }}"
-      {{- end }}
     {{- end }}
     {{- if .Values.search }}
             - name: MDB_SEARCH_COMMUNITY_REPO_URL

helm_chart/values-openshift.yaml

@@ -27,7 +27,7 @@ operator:
   # Environment variables prefixed with RELATED_IMAGE_ are used by operator-sdk to generate relatedImages section
   # with sha256 digests pinning for the certified operator bundle with disconnected environment feature enabled.
   # https://docs.openshift.com/container-platform/4.14/operators/operator_sdk/osdk-generating-csvs.html#olm-enabling-operator-for-restricted-network_osdk-generating-csvs
-  version: 1.2.0
+  version: 1.3.0
 relatedImages:
   opsManager:
   - 6.0.26

helm_chart/values.yaml

@@ -22,7 +22,7 @@ operator:
   deployment_name: mongodb-kubernetes-operator
 
   # Version of mongodb-kubernetes-operator
-  version: 1.2.0
+  version: 1.3.0
 
   # The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
   watchedResources:
@@ -123,24 +123,24 @@ operator:
 ## Database
 database:
   name: mongodb-kubernetes-database
-  version: 1.2.0
+  version: 1.3.0
 
 initDatabase:
   name: mongodb-kubernetes-init-database
-  version: 1.2.0
+  version: 1.3.0
 
 ## Ops Manager
 opsManager:
   name: mongodb-enterprise-ops-manager-ubi
 
 initOpsManager:
   name: mongodb-kubernetes-init-ops-manager
-  version: 1.2.0
+  version: 1.3.0
 
 ## Application Database
 initAppDb:
   name: mongodb-kubernetes-init-appdb
-  version: 1.2.0
+  version: 1.3.0
 
 agent:
   name: mongodb-agent

public/dockerfiles/mongodb-kubernetes-database/1.3.0/ubi/Dockerfile

@@ -0,0 +1,71 @@
+FROM scratch AS base
+
+COPY ./docker/mongodb-kubernetes-database/LICENSE /data/licenses/mongodb-kubernetes-database
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+
+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}" \
+        && mkdir -p /var/lib/mongodb-mms-automation \
+        && chmod 0775 /var/lib/mongodb-mms-automation \
+        && mkdir -p /data \
+        && chmod 0775 /data \
+        && mkdir -p /journal \
+        && chmod 0775 /journal \
+        && mkdir -p "${MMS_HOME}" \
+        && chmod -R 0775 "${MMS_HOME}"
+
+ARG VERSION
+
+LABEL name="MongoDB Kubernetes Database" \
+      version="${VERSION}" \
+      summary="MongoDB Kubernetes Database Image" \
+      description="MongoDB Kubernetes Database Image" \
+      vendor="MongoDB" \
+      release="1" \
+      maintainer="support@mongodb.com"
+
+# USER needs to be set for this image to pass RedHat verification. Some customers have these requirements as well
+# It does not matter what number it is, as long as it is set to something.
+# However, OpenShift will run the container as a random user,
+# and the number in this configuration is not relevant.
+USER 2000
+
+# The docker image doesn't have any scripts so by default does nothing
+# The script will be copied in runtime from init containers and the operator is expected
+# to override the COMMAND
+ENTRYPOINT ["sleep infinity"]
+
+COPY --from=base /data/licenses/mongodb-kubernetes-database /licenses/mongodb-kubernetes-database