Update docs snippets script

Author: lsierant

docs/community-search/quick-start/README.md

@@ -35,14 +35,10 @@ export MDB_VERSION="8.0.10"
 
 # root admin user for convenience, not used here at all in this guide
 export MDB_ADMIN_USER_PASSWORD="admin-user-password-CHANGE-ME"
-<<<<<<< Updated upstream
 # regular user performing restore and search queries on sample mflix database
 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 MDB_SEARCH_SYNC_USER_PASSWORD="search-user-password-CHANGE-ME"
->>>>>>> Stashed changes
 
 export OPERATOR_HELM_CHART="mongodb/mongodb-kubernetes"
 # comma-separated key=value pairs for additional parameters passed to the helm-chart installing the operator
@@ -91,18 +87,13 @@ kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" --namespace "${MDB_NAMESPACE}"
   --from-literal=password="${MDB_ADMIN_USER_PASSWORD}"
 
 kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" --namespace "${MDB_NAMESPACE}" \
-<<<<<<< Updated upstream
   create secret generic mdbc-rs-search-sync-source-password \
   --from-literal=password="${MDB_SEARCH_SYNC_USER_PASSWORD}"
 
 kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" --namespace "${MDB_NAMESPACE}" \
   create secret generic mdb-user-password \
   --from-literal=password="${MDB_USER_PASSWORD}"
 
-=======
-  create secret generic search-user-password \
-  --from-literal=password="${MDB_SEARCH_SYNC_USER_PASSWORD}"
->>>>>>> Stashed changes
 ```
 Ensure these secrets are created in the same namespace where you plan to deploy MongoDB.
 
@@ -318,12 +309,8 @@ kubectl exec -n "${MDB_NAMESPACE}" --context "${K8S_CLUSTER_0_CONTEXT_NAME}" mon
 echo "Downloading sample database archive..."
 curl https://atlas-education.s3.amazonaws.com/sample_mflix.archive -o /tmp/sample_mflix.archive
 echo "Restoring sample database"
-<<<<<<< Updated upstream
 mongorestore --archive=/tmp/sample_mflix.archive --verbose=1 --drop --nsInclude 'sample_mflix.*' \
 --uri="mongodb://mdb-user:${MDB_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs"
-=======
-mongorestore --archive=/tmp/sample_mflix.archive --verbose=1 --drop --nsInclude 'sample_mflix.*' --uri="mongodb://search-user:${MDB_SEARCH_SYNC_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs"
->>>>>>> Stashed changes
 EOF
 )"
 ```
@@ -338,11 +325,7 @@ Before performing search queries, create a search index. This step uses `kubectl
 #!/bin/bash
 
 kubectl exec --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${MDB_NAMESPACE}" mongodb-tools-pod -- \
-<<<<<<< Updated upstream
   mongosh --quiet "mongodb://mdb-user:${MDB_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs" \
-=======
-  mongosh --quiet "mongodb://search-user:${MDB_SEARCH_SYNC_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs" \
->>>>>>> Stashed changes
     --eval "use sample_mflix" \
     --eval 'db.movies.createSearchIndex("default", { mappings: { dynamic: true } });'
 ```
@@ -355,30 +338,9 @@ Creating a search index is an asynchronous operation. This script polls periodic
 ```shell copy
 #!/bin/bash
 
-<<<<<<< Updated upstream
 # Currently it's not possible to check the status of search indexes, we need to just wait
 echo "Sleeping to wait for search indexes to be created"
 sleep 60
-=======
-for _ in $(seq 0 10); do
-  search_index_status=$(kubectl exec --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${MDB_NAMESPACE}" mongodb-tools-pod -- \
-      mongosh --quiet "mongodb://search-user:${MDB_SEARCH_SYNC_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs" \
-        --eval "use sample_mflix" \
-        --eval 'db.movies.getSearchIndexes("default")[0]["status"]')
-
-  if [[ "${search_index_status}" == "READY" ]]; then
-    echo "Search index is ready."
-    break
-  fi
-  echo "Search index is not ready yet: status=${search_index_status}"
-  sleep 2
-done
-
-if [[ "${search_index_status}" != "READY" ]]; then
-  echo "Error waiting for the search index to be ready"
-  return 1
-fi
->>>>>>> Stashed changes
 ```
 
 ### 17. Execute a Search Query
@@ -431,11 +393,7 @@ EOF
 
 kubectl exec --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${MDB_NAMESPACE}" mongodb-tools-pod -- /bin/bash -eu -c "$(cat <<EOF
 echo '${mdb_script}' > /tmp/mdb_script.js
-<<<<<<< Updated upstream
 mongosh --quiet "mongodb://mdb-user:${MDB_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs" < /tmp/mdb_script.js
-=======
-mongosh --quiet "mongodb://search-user:${MDB_SEARCH_SYNC_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs" < /tmp/mdb_script.js
->>>>>>> Stashed changes
 EOF
 )"
 ```

docs/community-search/quick-start/code_snippets/0305_create_mongodb_community_user_secrets.sh

@@ -3,11 +3,7 @@ kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" --namespace "${MDB_NAMESPACE}"
   --from-literal=password="${MDB_ADMIN_USER_PASSWORD}"
 
 kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" --namespace "${MDB_NAMESPACE}" \
-<<<<<<< Updated upstream
   create secret generic mdbc-rs-search-sync-source-password \
-=======
-  create secret generic search-sync-user-password \
->>>>>>> Stashed changes
   --from-literal=password="${MDB_SEARCH_SYNC_USER_PASSWORD}"
 
 kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" --namespace "${MDB_NAMESPACE}" \

docs/community-search/quick-start/code_snippets/0440_wait_for_search_index_ready.sh

@@ -1,26 +1,5 @@
 #!/bin/bash
 
-<<<<<<< Updated upstream
 # Currently it's not possible to check the status of search indexes, we need to just wait
 echo "Sleeping to wait for search indexes to be created"
 sleep 60
-=======
-for _ in $(seq 0 10); do
-  search_index_status=$(kubectl exec --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${MDB_NAMESPACE}" mongodb-tools-pod -- \
-      mongosh --quiet "mongodb://mdb-user:${MDB_USER_PASSWORD}@mdbc-rs-0.mdbc-rs-svc.${MDB_NAMESPACE}.svc.cluster.local:27017/?replicaSet=mdbc-rs" \
-        --eval "use sample_mflix" \
-        --eval 'db.movies.getSearchIndexes("default")[0]["status"]')
-
-  if [[ "${search_index_status}" == "READY" ]]; then
-    echo "Search index is ready."
-    break
-  fi
-  echo "Search index is not ready yet: status=${search_index_status}"
-  sleep 2
-done
-
-if [[ "${search_index_status}" != "READY" ]]; then
-  echo "Error waiting for the search index to be ready"
-  return 1
-fi
->>>>>>> Stashed changes

docs/community-search/quick-start/community_search_snippets_test.sh.run.log

@@ -1,11 +1,7 @@
 export K8S_CLUSTER_0_CONTEXT_NAME="${CLUSTER_NAME}"
 
-<<<<<<< Updated upstream
 source "${PROJECT_DIR}/scripts/funcs/operator_deployment"
 source "${PROJECT_DIR}/scripts/dev/contexts/e2e_mdb_community"
-=======
-source scripts/funcs/operator_deployment
->>>>>>> Stashed changes
 OPERATOR_ADDITIONAL_HELM_VALUES="$(get_operator_helm_values | tr ' ' ',')"
 export OPERATOR_ADDITIONAL_HELM_VALUES
 export OPERATOR_HELM_CHART="${PROJECT_DIR}/helm_chart"

docs/community-search/quick-start/env_variables_e2e_private.sh

@@ -1,17 +1,12 @@
 Release "mongodb-kubernetes" does not exist. Installing it now.
 NAME: mongodb-kubernetes
-<<<<<<< Updated upstream
 LAST DEPLOYED: Mon Jul 28 15:07:59 2025
-=======
-LAST DEPLOYED: Fri Jul 25 20:50:36 2025
->>>>>>> Stashed changes
 NAMESPACE: mongodb
 STATUS: deployed
 REVISION: 1
 TEST SUITE: None
 USER-SUPPLIED VALUES:
 database:
-<<<<<<< Updated upstream
   version: 68876175f5ad6d0007fdc1d4
 initAppDb:
   version: 68876175f5ad6d0007fdc1d4
@@ -21,32 +16,6 @@ initOpsManager:
   version: 68876175f5ad6d0007fdc1d4
 operator:
   version: 68876175f5ad6d0007fdc1d4
-=======
-  name: mongodb-kubernetes-database
-  version: latest
-initAppDb:
-  version: latest
-initDatabase:
-  version: latest
-initOpsManager:
-  version: latest
-managedSecurityContext: false
-mongodb:
-  imageType: ubi9
-  name: mongodb-enterprise-server
-operator:
-  enablePVCResize: true
-  maxConcurrentReconciles: 10
-  mdbDefaultArchitecture: non-static
-  telemetry:
-    collection:
-      frequency: 1m
-    send:
-      enabled: false
-  version: latest
-opsManager:
-  name: mongodb-enterprise-ops-manager-ubi
->>>>>>> Stashed changes
 registry:
   agent: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
   appDb: quay.io/mongodb
@@ -59,15 +28,9 @@ registry:
   opsManager: quay.io/mongodb
 search:
   community:
-<<<<<<< Updated upstream
     name: community
     repo: 268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot
     version: fbd60fb055dd500058edcb45677ea85d19421f47
-=======
-    name: mongodb-search-community
-    repo: quay.io/mongodb
-    version: 1.47.0
->>>>>>> Stashed changes
 
 COMPUTED VALUES:
 agent:
@@ -100,7 +63,6 @@ community:
     version: 4.4.0
 database:
   name: mongodb-kubernetes-database
-<<<<<<< Updated upstream
   version: 68876175f5ad6d0007fdc1d4
 initAppDb:
   name: mongodb-kubernetes-init-appdb
@@ -111,18 +73,6 @@ initDatabase:
 initOpsManager:
   name: mongodb-kubernetes-init-ops-manager
   version: 68876175f5ad6d0007fdc1d4
-=======
-  version: latest
-initAppDb:
-  name: mongodb-kubernetes-init-appdb
-  version: latest
-initDatabase:
-  name: mongodb-kubernetes-init-database
-  version: latest
-initOpsManager:
-  name: mongodb-kubernetes-init-ops-manager
-  version: latest
->>>>>>> Stashed changes
 managedSecurityContext: false
 mongodb:
   appdbAssumeOldFormat: false
@@ -169,11 +119,7 @@ operator:
   vaultSecretBackend:
     enabled: false
     tlsSecretRef: ""
-<<<<<<< Updated upstream
   version: 68876175f5ad6d0007fdc1d4
-=======
-  version: latest
->>>>>>> Stashed changes
   watchedResources:
   - mongodb
   - opsmanagers
@@ -203,16 +149,9 @@ registry:
   versionUpgradeHook: quay.io/mongodb
 search:
   community:
-<<<<<<< Updated upstream
     name: community
     repo: 268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot
     version: fbd60fb055dd500058edcb45677ea85d19421f47
-=======
-    name: mongodb-search-community
-    repo: quay.io/mongodb
-    version: 1.47.0
-subresourceEnabled: true
->>>>>>> Stashed changes
 versionUpgradeHook:
   name: mongodb-kubernetes-operator-version-upgrade-post-start-hook
   version: 1.0.9
@@ -562,11 +501,7 @@ spec:
         - name: image-registries-secret
       containers:
         - name: mongodb-kubernetes-operator
-<<<<<<< Updated upstream
           image: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes:68876175f5ad6d0007fdc1d4"
-=======
-          image: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes:latest"
->>>>>>> Stashed changes
           imagePullPolicy: Always
           args:
             - -watch-resource=mongodb
@@ -611,35 +546,21 @@ spec:
             - name: INIT_DATABASE_IMAGE_REPOSITORY
               value: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database
             - name: INIT_DATABASE_VERSION
-<<<<<<< Updated upstream
               value: 68876175f5ad6d0007fdc1d4
             - name: DATABASE_VERSION
               value: 68876175f5ad6d0007fdc1d4
-=======
-              value: latest
-            - name: DATABASE_VERSION
-              value: latest
->>>>>>> Stashed changes
             # Ops Manager
             - name: OPS_MANAGER_IMAGE_REPOSITORY
               value: quay.io/mongodb/mongodb-enterprise-ops-manager-ubi
             - name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
               value: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager
             - name: INIT_OPS_MANAGER_VERSION
-<<<<<<< Updated upstream
               value: 68876175f5ad6d0007fdc1d4
-=======
-              value: latest
->>>>>>> Stashed changes
             # AppDB
             - name: INIT_APPDB_IMAGE_REPOSITORY
               value: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb
             - name: INIT_APPDB_VERSION
-<<<<<<< Updated upstream
               value: 68876175f5ad6d0007fdc1d4
-=======
-              value: latest
->>>>>>> Stashed changes
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
@@ -679,17 +600,9 @@ spec:
               value: "ubi8"
             # Community Env Vars End
             - name: MDB_SEARCH_COMMUNITY_REPO_URL
-<<<<<<< Updated upstream
               value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot"
             - name: MDB_SEARCH_COMMUNITY_NAME
               value: "community"
             - name: MDB_SEARCH_COMMUNITY_VERSION
               value: "fbd60fb055dd500058edcb45677ea85d19421f47"
-=======
-              value: "quay.io/mongodb"
-            - name: MDB_SEARCH_COMMUNITY_NAME
-              value: "mongodb-search-community"
-            - name: MDB_SEARCH_COMMUNITY_VERSION
-              value: "1.47.0"
->>>>>>> Stashed changes