Merge branch 'correction-1.5.3' into 'development'

Correction 1.5.3

See merge request !3

samples/mongodb/minimal/replica-set.yaml

@@ -9,7 +9,7 @@ metadata:
   name: my-replica-set
 spec:
   members: 3
-  version: 4.4.0-ent
+  version: 4.2.1-ent
   type: ReplicaSet
 
   opsManager:
@@ -18,18 +18,3 @@ spec:
   credentials: my-credentials
 
   persistent: false
-
-  podSpec:
-    # 'podTemplate' allows to set custom fields in PodTemplateSpec (https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#podtemplatespec-v1-core)
-    # for the Database StatefulSet.
-    podTemplate:
-      spec:        
-        containers:
-          - name: mongodb-enterprise-database
-            resources:
-              limits:
-                cpu: "2"
-                memory: 700m
-              requests:
-                cpu: "1"
-                memory: 500m

samples/mongodb/minimal/sharded-cluster.yaml

@@ -12,7 +12,7 @@ spec:
   mongodsPerShardCount: 3
   mongosCount: 2
   configServerCount: 3
-  version: 4.4.0-ent
+  version: 4.2.1-ent
   type: ShardedCluster
   # Before you create this object, you'll need to create a project ConfigMap and a
   # credentials Secret. For instructions on how to do this, please refer to our
@@ -27,40 +27,3 @@ spec:
   # testing only, and must not be used in production. 'false' will disable
   # Persistent Volume Claims. The default is 'true'
   persistent: false
-
-  configSrvPodSpec:
-    podTemplate:
-      spec:        
-        containers:
-          - name: mongodb-enterprise-database
-            resources:
-              limits:
-                cpu: "2"
-                memory: 700m
-              requests:
-                cpu: "1"
-                memory: 500m
-  shardPodSpec:
-    podTemplate:
-      spec:        
-        containers:
-          - name: mongodb-enterprise-database
-            resources:
-              limits:
-                cpu: "2"
-                memory: 700m
-              requests:
-                cpu: "1"
-                memory: 500m
-  mongosPodSpec:
-    podTemplate:
-      spec:        
-        containers:
-          - name: mongodb-enterprise-database
-            resources:
-              limits:
-                cpu: "1"
-                memory: 200m
-              requests:
-                cpu: "0.5"
-                memory: 100m
\ No newline at end of file

samples/mongodb/minimal/standalone.yaml

@@ -8,7 +8,7 @@ kind: MongoDB
 metadata:
   name: my-standalone
 spec:
-  version: 4.4.0-ent
+  version: 4.2.1-ent
   type: Standalone
   # Before you create this object, you'll need to create a project ConfigMap and a
   # credentials Secret. For instructions on how to do this, please refer to our
@@ -23,18 +23,3 @@ spec:
   # testing only, and must not be used in production. 'false' will disable
   # Persistent Volume Claims. The default is 'true'
   persistent: false
-
-  podSpec:
-    # 'podTemplate' allows to set custom fields in PodTemplateSpec (https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#podtemplatespec-v1-core)
-    # for the Database StatefulSet.
-    podTemplate:
-      spec:        
-        containers:
-          - name: mongodb-enterprise-database
-            resources:
-              limits:
-                cpu: "2"
-                memory: 700m
-              requests:
-                cpu: "1"
-                memory: 500m
\ No newline at end of file

samples/mongodb/mongodb-options/replica-set-mongod-options.yaml

-apiVersion: mongodb.com/v1
-kind: MongoDB
-metadata:
-  name: my-replica-set-options
-spec:
-  members: 3
-  version: 4.2.8-ent
-  type: ReplicaSet
-  opsManager:
-    configMapRef:
-      name: my-project
-  credentials: my-credentials
-  persistent: true
-  # optional. Allows to pass custom MongoDB process configuration
-  additionalMongodConfig:
-    systemLog:
-      logAppend: true
-      verbosity: 4
-    operationProfiling:
-      mode: slowOp

samples/mongodb/mongodb-options/sharded-cluster-mongod-options.yaml

-apiVersion: mongodb.com/v1
-kind: MongoDB
-metadata:
-  name: my-sharded-cluster-options
-spec:
-  version: 4.2.8-ent
-  type: ShardedCluster
-  opsManager:
-    configMapRef:
-      name: my-project
-  credentials: my-credentials
-  persistent: true
-  shardCount: 2
-  mongodsPerShardCount: 3
-  mongosCount: 2
-  configServerCount: 1
-  mongos:
-    # optional. Allows to pass custom configuration for mongos processes
-    additionalMongodConfig:
-      systemLog:
-        logAppend: true
-        verbosity: 4
-  configSrv:
-    # optional. Allows to pass custom configuration for Config Server mongod processes
-    additionalMongodConfig:
-      operationProfiling:
-        mode: slowOp
-  shard:
-    additionalMongodConfig:
-    # optional. Allows to pass custom configuration for Shards mongod processes
-      storage:
-        journal:
-          commitIntervalMs: 50

samples/ops-manager/ops-manager-appdb-agent-startup-parameters.yaml

----
-apiVersion: mongodb.com/v1
-kind: MongoDBOpsManager
-metadata:
-  name: ops-manager
-spec:
-  # the number of Ops Manager instances to run. Set to value bigger
-  # than 1 to get high availability and upgrades without downtime
-  replicas: 3
-
-  # the version of Ops Manager distro to use
-  version: 4.4.1
-
-  # optional. Specify the custom cluster domain of the Kubernetes cluster if it's different from the default one ('cluster.local').
-  # This affects the urls generated by the Operator.
-  # This field is also used for Application Database url
-  clusterDomain: mycompany.net
-
-  # the name of the secret containing admin user credentials.
-  # Either remove the secret or change the password using Ops Manager UI after the Ops Manager
-  # resource is created!
-  adminCredentials: ops-manager-admin-secret
-
-  # the application database backing Ops Manager. Replica Set is the only supported type
-  # Application database has the SCRAM-SHA authentication mode always enabled
-  applicationDatabase:
-    members: 3
-    persistent: true
-    # optional. Allows to pass  custom flags that will be used
-    # when launching the mongodb agent. All values must be strings
-    agent:
-      startupOptions:
-        serverSelectionTimeoutSeconds: "20"

samples/ops-manager/ops-manager-backup.yaml

@@ -5,7 +5,7 @@ metadata:
   name: ops-manager-backup
 spec:
   replicas: 1
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
 
   # optional. Enabled by default

samples/ops-manager/ops-manager-external.yaml

@@ -5,7 +5,7 @@ metadata:
   name: ops-manager-external
 spec:
   replicas: 1
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
 
   configuration:

samples/ops-manager/ops-manager-ignore-ui-setup.yaml

@@ -4,7 +4,7 @@ metadata:
   name: ops-manager-ignore-ui
 spec:
   replicas: 1
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
 
   configuration:

samples/ops-manager/ops-manager-local-mode.yaml

@@ -4,7 +4,7 @@ metadata:
   name: ops-manager-localmode
 spec:
   replicas: 2
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
   configuration:
     # this enables local mode in Ops Manager

samples/ops-manager/ops-manager-non-root.yaml

----
-apiVersion: mongodb.com/v1
-kind: MongoDBOpsManager
-metadata:
-  name: ops-manager
-spec:
-  replicas: 1
-  version: 4.4.1
-
-  adminCredentials: ops-manager-admin-secret
-
-  applicationDatabase:
-    members: 3
-    version: 4.2.6-ent
-    persistent: true
-
-
-  # The statefulSet entry will modify the way the StatefulSet holding the
-  # Ops Manager and Backup Daemon Pods will be created. In this case we can
-  # specify a non-default SecurityContext.
-  statefulSet:
-    spec:
-      template:
-        spec:
-          securityContext:
-            fsGroup: 5000
-            runAsUser: 5000

samples/ops-manager/ops-manager-pod-spec.yaml

@@ -4,7 +4,7 @@ metadata:
   name: ops-manager-pod-spec
 spec:
   replicas: 1
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
   configuration:
     mms.testUtil.enabled: "true"

samples/ops-manager/ops-manager-scram.yaml

@@ -5,7 +5,7 @@ metadata:
   name: ops-manager-scram
 spec:
   replicas: 1
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
 
   # the application database backing Ops Manager. Replica Set is the only supported type

samples/ops-manager/ops-manager-tls.yaml

@@ -4,7 +4,7 @@ metadata:
   name: ops-manager-tls
 spec:
   replicas: 1
-  version: 4.4.1
+  version: 4.2.12
   adminCredentials: ops-manager-admin-secret
 
   configuration:

samples/ops-manager/ops-manager.yaml

@@ -9,7 +9,7 @@ spec:
   replicas: 3
 
   # the version of Ops Manager distro to use
-  version: 4.4.1
+  version: 4.2.12
 
   # optional. Specify the custom cluster domain of the Kubernetes cluster if it's different from the default one ('cluster.local').
   # This affects the urls generated by the Operator.
@@ -33,9 +33,5 @@ spec:
     # The bundled MongoDB binary will be used if omitted and no download from the Internet will happen
     version: 4.2.6-ent
     persistent: true
-    # optional. Allows to pass custom MongoDB process configuration
-    additionalMongodConfig:
-      operationProfiling:
-        mode: slowOp
     podSpec:
       cpu: '0.25'

support/mdb_operator_diagnostic_data.sh

 #!/usr/bin/env bash
 
-set -Eeou pipefail
-
 #
 # mdb_operator_diagnostic_data.sh
 #
@@ -70,7 +68,7 @@ if [ ${private_mode} == 0 ]; then
 fi
 
 echo "++ Versions"
-mdb_operator_pod=$(kubectl -n "${namespace}" get pods -l "controller=${operator_name}" -o name | cut -d'/' -f 2)
+mdb_operator_pod=$(kubectl -n "${namespace}" get pods -l "app=${operator_name}" -o name | cut -d'/' -f 2)
 echo "+ Operator Pod: pod/${mdb_operator_pod}"
 
 mdb_operator_filename="operator.yaml"
@@ -180,7 +178,7 @@ echo "+ Certificates (no private keys are captured)"
 csr_filename="csr.text"
 kubectl get csr | grep "${namespace}"
 echo "+ Saving Certificate state into ${csr_filename}"
-kubectl describe "$(kubectl get csr -o name | grep "${namespace}")"
+kubectl describe "$(kubectl get csr -o name | grep ${namespace})"
 
 echo "++ MongoDBUser Resource Status"
 mdbusers_filename="mdbu.yaml"