Update sample files from MEKO (#1690)

Author: lsierant

source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0045_create_operator_namespace.sh

@@ -1,2 +1,8 @@
 kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" create namespace "${OPERATOR_NAMESPACE}"
 kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" label namespace "${OPERATOR_NAMESPACE}" istio-injection=enabled --overwrite
+
+kubectl --context "${K8S_CLUSTER_1_CONTEXT_NAME}" create namespace "${OPERATOR_NAMESPACE}"
+kubectl --context "${K8S_CLUSTER_1_CONTEXT_NAME}" label namespace "${OPERATOR_NAMESPACE}" istio-injection=enabled --overwrite
+
+kubectl --context "${K8S_CLUSTER_2_CONTEXT_NAME}" create namespace "${OPERATOR_NAMESPACE}"
+kubectl --context "${K8S_CLUSTER_3_CONTEXT_NAME}" label namespace "${OPERATOR_NAMESPACE}" istio-injection=enabled --overwrite

source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0310_ops_manager_deploy_on_single_member_cluster.sh

@@ -5,7 +5,7 @@ metadata:
   name: om
 spec:
   topology: MultiCluster
-  version: 7.0.1
+  version: "${OPS_MANAGER_VERSION}"
   adminCredentials: om-admin-user-credentials
   security:
     certsSecretPrefix: cert-prefix
@@ -15,7 +15,7 @@ spec:
     - clusterName: "${K8S_CLUSTER_0_CONTEXT_NAME}"
       members: 1
   applicationDatabase:
-    version: "6.0.5-ubi8"
+    version: "${APPDB_VERSION}"
     topology: MultiCluster
     security:
       certsSecretPrefix: cert-prefix

source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0320_ops_manager_add_second_cluster.sh

@@ -5,7 +5,7 @@ metadata:
   name: om
 spec:
   topology: MultiCluster
-  version: 7.0.1
+  version: "${OPS_MANAGER_VERSION}"
   adminCredentials: om-admin-user-credentials
   security:
     certsSecretPrefix: cert-prefix
@@ -17,7 +17,7 @@ spec:
     - clusterName: "${K8S_CLUSTER_1_CONTEXT_NAME}"
       members: 1
   applicationDatabase:
-    version: "6.0.5-ubi8"
+    version: "${APPDB_VERSION}"
     topology: MultiCluster
     security:
       certsSecretPrefix: cert-prefix

source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0510_ops_manager_enable_s3_backup.sh

@@ -5,7 +5,7 @@ metadata:
   name: om
 spec:
   topology: MultiCluster
-  version: 7.0.1
+  version: "${OPS_MANAGER_VERSION}"
   adminCredentials: om-admin-user-credentials
   security:
     certsSecretPrefix: cert-prefix
@@ -35,7 +35,7 @@ spec:
       mms.minimumTLSVersion: TLSv1.2
       mms.replyToEmailAddr: [email protected]
   applicationDatabase:
-    version: "6.0.5-ubi8"
+    version: "${APPDB_VERSION}"
     topology: MultiCluster
     security:
       certsSecretPrefix: cert-prefix

source/includes/code-examples/ops-manager-multi-cluster/env_variables.sh

@@ -1,17 +1,15 @@
 export MDB_GKE_PROJECT="scratch-kubernetes-team"
 #export MDB_GKE_PROJECT={GKE project name}
 
-# Scripts will iterate over this number of clusters.
-export NUMBER_OF_K8S_CLUSTERS=3
-
 export NAMESPACE="mongodb"
 export OPERATOR_NAMESPACE="mongodb-operator"
 export OPERATOR_HELM_CHART=../../../helm_chart
 
 # comma-separated key=value pairs
 # export OPERATOR_ADDITIONAL_HELM_VALUES=""
 
-# Adjust values for each cluster. The script will reference these variables to get values for n-th cluster.
+# Adjust the values for each Kubernetes cluster in your deployment.
+# The deployment script references the following variables to get values for each cluster.
 export K8S_CLUSTER_0="k8s-mdb-0"
 export K8S_CLUSTER_0_ZONE="europe-central2-a"
 export K8S_CLUSTER_0_NUMBER_OF_NODES=3
@@ -30,8 +28,8 @@ export K8S_CLUSTER_2_NUMBER_OF_NODES=1
 export K8S_CLUSTER_2_MACHINE_TYPE="e2-standard-4"
 export K8S_CLUSTER_2_CONTEXT_NAME="gke_${MDB_GKE_PROJECT}_${K8S_CLUSTER_2_ZONE}_${K8S_CLUSTER_2}"
 
-# comment that to not create preemptible nodes
-# DO NOT USE preemptible on production
+# Comment out the following line so that the script does not create preemptible nodes.
+# DO NOT USE preemptible nodes in production.
 export GKE_SPOT_INSTANCES_SWITCH="--preemptible"
 
 export S3_OPLOG_BUCKET_NAME=s3-oplog-store
@@ -42,6 +40,10 @@ export S3_ENDPOINT="minio.tenant-tiny.svc.cluster.local"
 export S3_ACCESS_KEY="console"
 export S3_SECRET_KEY="console123"
 
-# change to external domain if needed
+# (Optional) Change the following setting when using the external URL.
 export OPS_MANAGER_EXTERNAL_DOMAIN="om-svc.${NAMESPACE}.svc.cluster.local"
 
+export OPS_MANAGER_VERSION="7.0.1"
+export APPDB_VERSION="6.0.5-ubi8"
+
+