Merge branch 'release-1.0'

# Conflicts:
#	RELEASE_NOTES.md

Author: MaciejKaras

RELEASE_NOTES.md

@@ -1,18 +1,22 @@
 [//]: # (Consider renaming or removing the header for next release, otherwise it appears as duplicate in the published release, e.g: https://github.com/mongodb/mongodb-enterprise-kubernetes/releases/tag/1.22.0 )
 <!-- Next Release -->
-
 # MCK 1.1.0 Release Notes
 
 ## New Features
 
 * **MongoDBSearch (Community Private Preview)**: Added support for deploying MongoDB Search (Community Private Preview Edition) that enables full-text and vector search capabilities for MongoDBCommunity deployments.
-  * Added new MongoDB CRD which is watched by default by the operator.
-    * For more information please see: `TBD LINK TO DOC MARKDOWN`
-  * Private Preview phase comes with some limitations:
-    * minimum MongoDB Community version: 8.0.
-    * TLS must be disabled in MongoDB (communication between mongot and mongod is in plaintext for now).
+    * Added new MongoDB CRD which is watched by default by the operator.
+        * For more information please see: `TBD LINK TO DOC MARKDOWN`
+    * Private Preview phase comes with some limitations:
+        * minimum MongoDB Community version: 8.0.
+        * TLS must be disabled in MongoDB (communication between mongot and mongod is in plaintext for now).
 
 <!-- Past Releases -->
+# MCK 1.0.1 Release Notes
+
+## Bug Fixes
+* Fix missing agent images in the operator bundle in OpenShift catalog and operatorhub.io.
+* **MongoDBCommunity** resource was missing from watched list in Helm Charts
 
 # MCK 1.0.0 Release Notes
 

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.0.0"
+          image: "quay.io/mongodb/mongodb-kubernetes:1.0.1"
           imagePullPolicy: Always
           args:
             - -watch-resource=mongodb
@@ -68,21 +68,21 @@ spec:
             - name: INIT_DATABASE_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-kubernetes-init-database
             - name: INIT_DATABASE_VERSION
-              value: 1.0.0
+              value: 1.0.1
             - name: DATABASE_VERSION
-              value: 1.0.0
+              value: 1.0.1
             # 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.0.0
+              value: 1.0.1
             # AppDB
             - name: INIT_APPDB_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-kubernetes-init-appdb
             - name: INIT_APPDB_VERSION
-              value: 1.0.0
+              value: 1.0.1
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
@@ -121,52 +121,70 @@ spec:
             - name: MDB_COMMUNITY_IMAGE_TYPE
               value: "ubi8"
             # Community Env Vars End
-            - name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_0_0
-              value: "quay.io/mongodb/mongodb-kubernetes-database:1.0.0"
-            - name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_0_0
-              value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.0.0"
-            - name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_0_0
-              value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.0.0"
-            - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_0_0
-              value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.0.0"
+            - name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_0_1
+              value: "quay.io/mongodb/mongodb-kubernetes-database:1.0.1"
+            - name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_0_1
+              value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.0.1"
+            - name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_0_1
+              value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.0.1"
+            - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_0_1
+              value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
               value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
               value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1
               value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1_1_0_0
               value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1_1.0.1"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26

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.0.0
+    containerImage: quay.io/mongodb/mongodb-kubernetes:1.0.1
     createdAt: ""
     description: The MongoDB Controllers for Kubernetes enable easy deploys of MongoDB
       into Kubernetes clusters, using our management, monitoring and backup platforms,
@@ -452,3 +452,4 @@ spec:
   provider:
     name: MongoDB, Inc
   version: 0.0.0
+  replaces: mongodb-kubernetes.v1.0.0

helm_chart/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 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.0.0
+version: 1.0.1
 kubeVersion: '>=1.16-0'
 type: application
 keywords:

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.0.0
+  version: 1.0.1
 relatedImages:
   opsManager:
   - 6.0.25
@@ -93,23 +93,32 @@ relatedImages:
   agent:
   - 107.0.13.8702-1
   - 107.0.13.8702-1_1.0.0
+  - 107.0.13.8702-1_1.0.1
   - 107.0.15.8741-1
   - 107.0.15.8741-1_1.0.0
+  - 107.0.15.8741-1_1.0.1
   - 108.0.2.8729-1
   - 108.0.4.8770-1
   - 108.0.4.8770-1_1.0.0
+  - 108.0.4.8770-1_1.0.1
   - 108.0.6.8796-1
   - 108.0.6.8796-1_1.0.0
+  - 108.0.6.8796-1_1.0.1
   - 108.0.7.8810-1
   - 108.0.7.8810-1_1.0.0
+  - 108.0.7.8810-1_1.0.1
   - 12.0.33.7866-1
   - 12.0.33.7866-1_1.0.0
+  - 12.0.33.7866-1_1.0.1
   - 12.0.34.7888-1
   - 12.0.34.7888-1_1.0.0
+  - 12.0.34.7888-1_1.0.1
   - 12.0.35.7911-1
   - 12.0.35.7911-1_1.0.0
+  - 12.0.35.7911-1_1.0.1
   - 13.34.0.9465-1
   - 13.34.0.9465-1_1.0.0
+  - 13.34.0.9465-1_1.0.1
   mongodbLegacyAppDb:
   - 4.2.11-ent
   - 4.2.2-ent

helm_chart/values.yaml

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

public/.evergreen.yml

@@ -61,14 +61,15 @@ functions:
           <<: *go_env
           MACOS_NOTARY_KEY: ${macos_notary_keyid}
           MACOS_NOTARY_SECRET: ${macos_notary_secret}
+        # TODO: triggered_by_git_tag is not set, because we run the task manually
           GORELEASER_CURRENT_TAG: ${triggered_by_git_tag}
         # shell.exec EVG Task doesn't have add_to_path, so we need to explicitly add the path export below.
         script: |
           set -Eeu pipefail
 
           export PATH=$GOROOT/bin:$PATH
           export GITHUB_TOKEN=${generated_token}
-          ${workdir}/goreleaser release --rm-dist
+          ${workdir}/goreleaser release --clean
 
 tasks:
   - name: package_goreleaser

public/dockerfiles/mongodb-agent/107.0.13.8702-1_1.0.1/ubi/Dockerfile

@@ -0,0 +1,64 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+
+LABEL name="MongoDB Agent" \
+      version="${version}" \
+      summary="MongoDB Agent" \
+      description="MongoDB Agent" \
+      vendor="MongoDB" \
+      release="1" \
+      maintainer="[email protected]"
+
+COPY --from=base /data/probe.sh /opt/scripts/probe.sh
+COPY --from=base /data/readinessprobe /opt/scripts/readinessprobe
+COPY --from=base /data/version-upgrade-hook /opt/scripts/version-upgrade-hook
+COPY --from=base /data/agent-launcher-lib.sh /opt/scripts/agent-launcher-lib.sh
+COPY --from=base /data/agent-launcher.sh /opt/scripts/agent-launcher.sh
+COPY --from=base /data/LICENSE /licenses/LICENSE
+
+# 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/*
+
+
+COPY --from=base /data/mongodb_tools_ubi.tgz /tools/mongodb_tools.tgz
+COPY --from=base /data/mongodb_agent_ubi.tgz /agent/mongodb_agent.tgz
+
+RUN tar xfz /tools/mongodb_tools.tgz
+RUN mv mongodb-database-tools-*/bin/* /tools
+RUN chmod +x /tools/*
+RUN rm /tools/mongodb_tools.tgz
+RUN rm -rf /mongodb-database-tools-*
+
+RUN tar xfz /agent/mongodb_agent.tgz
+RUN mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent
+RUN chmod +x /agent/mongodb-agent
+RUN rm /agent/mongodb_agent.tgz
+RUN rm -rf mongodb-mms-automation-agent-*
+
+RUN mkdir -p /var/lib/automation/config
+RUN chmod -R +r /var/lib/automation/config
+
+USER 2000
+
+HEALTHCHECK --timeout=30s CMD ls /opt/scripts/readinessprobe || exit 1

public/dockerfiles/mongodb-agent/107.0.15.8741-1_1.0.1/ubi/Dockerfile

@@ -0,0 +1,64 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+
+LABEL name="MongoDB Agent" \
+      version="${version}" \
+      summary="MongoDB Agent" \
+      description="MongoDB Agent" \
+      vendor="MongoDB" \
+      release="1" \
+      maintainer="[email protected]"
+
+COPY --from=base /data/probe.sh /opt/scripts/probe.sh
+COPY --from=base /data/readinessprobe /opt/scripts/readinessprobe
+COPY --from=base /data/version-upgrade-hook /opt/scripts/version-upgrade-hook
+COPY --from=base /data/agent-launcher-lib.sh /opt/scripts/agent-launcher-lib.sh
+COPY --from=base /data/agent-launcher.sh /opt/scripts/agent-launcher.sh
+COPY --from=base /data/LICENSE /licenses/LICENSE
+
+# 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/*
+
+
+COPY --from=base /data/mongodb_tools_ubi.tgz /tools/mongodb_tools.tgz
+COPY --from=base /data/mongodb_agent_ubi.tgz /agent/mongodb_agent.tgz
+
+RUN tar xfz /tools/mongodb_tools.tgz
+RUN mv mongodb-database-tools-*/bin/* /tools
+RUN chmod +x /tools/*
+RUN rm /tools/mongodb_tools.tgz
+RUN rm -rf /mongodb-database-tools-*
+
+RUN tar xfz /agent/mongodb_agent.tgz
+RUN mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent
+RUN chmod +x /agent/mongodb-agent
+RUN rm /agent/mongodb_agent.tgz
+RUN rm -rf mongodb-mms-automation-agent-*
+
+RUN mkdir -p /var/lib/automation/config
+RUN chmod -R +r /var/lib/automation/config
+
+USER 2000
+
+HEALTHCHECK --timeout=30s CMD ls /opt/scripts/readinessprobe || exit 1