Enterprise snippets -wip

Author: lsierant

docs/search/01-search-community-deploy/code_snippets/01_0110_wait_for_operator_deployment.sh

@@ -0,0 +1,5 @@
+kubectl --context "${K8S_CTX}" -n "${MDB_NS}" rollout status --timeout=2m deployment/mongodb-kubernetes-operator
+echo "Operator deployment in ${OPERATOR_NAMESPACE} namespace"
+kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get deployments
+echo; echo "Operator pod in ${OPERATOR_NAMESPACE} namespace"
+kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get pods

docs/search/01-search-community-deploy/test.sh

@@ -15,6 +15,7 @@ run 01_0045_create_namespaces.sh
 run 01_0046_create_image_pull_secrets.sh
 run_for_output 01_0090_helm_add_mogodb_repo.sh
 run_for_output 01_0100_install_operator.sh
+run_for_output 01_0110_wait_for_operator_deployment.sh
 run 01_0305_create_mongodb_community_user_secrets.sh
 run 01_0310_create_mongodb_community_resource.sh
 run_for_output 01_0315_wait_for_community_resource.sh

docs/search/02-search-enterprise-deploy/code_snippets/02_0050_create_ops_manager_resources.sh

@@ -2,3 +2,7 @@ kubectl --context "${K8S_CTX}" -n "${MDB_NS}" create configmap om-project \
         --from-literal=projectName="${MDB_RESOURCE_NAME}" --from-literal=baseUrl="${OPS_MANAGER_API_URL}" \
         --from-literal=orgId="${OPS_MANAGER_ORG_ID:-}"
 
+kubectl --context "${K8S_CTX}" -n "${MDB_NS}" create secret generic om-credentials \
+  --from-literal=publicKey="${OPS_MANAGER_API_USER}" \
+  --from-literal=privateKey="${OPS_MANAGER_API_KEY}"
+

docs/search/02-search-enterprise-deploy/code_snippets/02_0305_create_mongodb_database_resource.sh

@@ -10,8 +10,8 @@ spec:
   type: ReplicaSet
   opsManager:
     configMapRef:
-      name: ${MDB_OPS_MANAGER_CONFIG_MAP_NAME}
-  credentials: ${MDB_OPS_MANAGER_CREDENTIALS_SECRET_NAME}
+      name: om-project
+  credentials: om-credentials
   security:
     authentication:
       enabled: true

docs/search/02-search-enterprise-deploy/code_snippets/02_0315_create_mongodb_users.sh

@@ -2,6 +2,7 @@
 kubectl --context "${K8S_CTX}" --namespace "${MDB_NS}" \
   create secret generic mdb-admin-user-password \
   --from-literal=password="${MDB_ADMIN_USER_PASSWORD}"
+
 kubectl apply --context "${K8S_CTX}" -n "${MDB_NS}" -f - <<EOF
 apiVersion: mongodb.com/v1
 kind: MongoDBUser

docs/search/02-search-enterprise-deploy/env_variables.sh

@@ -4,9 +4,16 @@ export K8S_CTX="<local cluster context>"
 # the following namespace will be created if not exists
 export MDB_NS="mongodb"
 
+
+export OPS_MANAGER_API_URL="<URL to Ops Manager API>"
+export OPS_MANAGER_API_USER="<Ops Manager's API user>"
+export OPS_MANAGER_API_KEY="<Ops Manager's API key>"
+export OPS_MANAGER_ORG_ID="Ops Manager's Org ID>"
+
 # minimum required MongoDB version for running MongoDB Search is 8.0.10
 export MDB_VERSION="8.0.10"
 
+# name of the MongoDB Custom Resource.
 export MDB_RESOURCE_NAME="mdb-rs"
 
 # root admin user for convenience, not used here at all in this guide
@@ -16,14 +23,11 @@ export MDB_USER_PASSWORD="mdb-user-password-CHANGE-ME"
 # user for MongoDB Search to connect to the replica set to synchronise data from
 export MDB_SEARCH_SYNC_USER_PASSWORD="search-sync-user-password-CHANGE-ME"
 
-export OPS_MANAGER_API_URL="<URL to Ops Manager API>"
-export OPS_MANAGER_API_USER="<Ops Manager's API user>"
-export OPS_MANAGER_API_KEY="<Ops Manager's API key>"
-export OPS_MANAGER_ORG_ID="Ops Manager's Org ID>"
 
 export OPERATOR_HELM_CHART="mongodb/mongodb-kubernetes"
 # comma-separated key=value pairs for additional parameters passed to the helm-chart installing the operator
 export OPERATOR_ADDITIONAL_HELM_VALUES=""
 
-export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=mdbc-rs"
+export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=mdbc-rs"
+echo "new connection string = ${MDB_CONNECTION_STRING}"
 

docs/search/02-search-enterprise-deploy/env_variables_e2e_private.sh

@@ -6,10 +6,6 @@ OPERATOR_ADDITIONAL_HELM_VALUES="$(get_operator_helm_values | tr ' ' ',')"
 export OPERATOR_ADDITIONAL_HELM_VALUES
 export OPERATOR_HELM_CHART="${PROJECT_DIR}/helm_chart"
 
-export MDB_NS="${NAMESPACE}"
-export MDB_OPS_MANAGER_CONFIG_MAP_NAME="my-project"
-export MDB_OPS_MANAGER_CREDENTIALS_SECRET_NAME="my-credentials"
-
 export OPS_MANAGER_API_URL="${OM_BASE_URL}"
 export OPS_MANAGER_API_USER="${OM_USER}"
 export OPS_MANAGER_API_KEY="${OM_API_KEY}"