diff --git a/.evergreen-functions.yml b/.evergreen-functions.yml index 90520daa4..fd7732769 100644 --- a/.evergreen-functions.yml +++ b/.evergreen-functions.yml @@ -830,7 +830,7 @@ functions: working_dir: src/github.com/mongodb/mongodb-kubernetes binary: scripts/code_snippets/sample_commit_output.sh - # it executes a script by convention: ./scripts/code_snippets/${task_name}_test.sh + # it executes a script by convention: ./scripts/code_snippets/tests/${task_name} test_code_snippets: - *switch_context - command: shell.exec @@ -843,4 +843,4 @@ functions: - code_snippets_reset - task_name script: | - ./scripts/code_snippets/${task_name}_test.sh + ./scripts/code_snippets/tests/${task_name} diff --git a/.evergreen-snippets.yml b/.evergreen-snippets.yml new file mode 100644 index 000000000..d409f5b9f --- /dev/null +++ b/.evergreen-snippets.yml @@ -0,0 +1,141 @@ +variables: + - &setup_and_teardown_group_gke_code_snippets + setup_task_can_fail_task: true + setup_group: + - func: clone + - func: setup_gcloud_cli + - func: setup_mongosh + - func: download_kube_tools + - func: build_multi_cluster_binary + teardown_task: + - func: upload_e2e_logs + - func: upload_code_snippets_logs + + - &setup_and_teardown_group_kind_code_snippets + setup_task_can_fail_task: true + setup_group: + - func: clone + - func: cleanup_exec_environment + - func: download_kube_tools + - func: configure_docker_auth + - func: setup_kubernetes_environment + teardown_task: + - func: upload_e2e_logs + - func: upload_code_snippets_logs + +# This variable is copied over from .evergreen.yml because anchors don't work for included files + - &base_om8_dependency + depends_on: + - name: build_om_images + variant: build_om80_images + - name: build_operator_ubi + variant: init_test_run + - name: build_init_database_image_ubi + variant: init_test_run + - name: build_database_image_ubi + variant: init_test_run + - name: build_test_image + variant: init_test_run + - name: build_init_appdb_images_ubi + variant: init_test_run + - name: build_init_om_images_ubi + variant: init_test_run + - name: build_agent_images_ubi + variant: init_test_run + +tasks: + # Code snippets tasks + # Each scripts/code_snippets/tests/test_*.sh should have its task defined here. + # TODO: it should be autogenerated + # Each task executes test_code_snippets functon executes scripts/code_snippets/tests/${task_name} by task name convention + - name: test_gke_multi_cluster_snippets.sh + tags: [ "code_snippets" ] + commands: + - func: test_code_snippets + - func: sample_commit_output + + - name: test_gke_multi_cluster_no_mesh_snippets.sh + tags: [ "code_snippets" ] + commands: + - func: test_code_snippets + - func: sample_commit_output + + - name: test_kind_search_community_snippets.sh + tags: [ "code_snippets", "patch-run" ] + commands: + - func: test_code_snippets + - func: sample_commit_output + +task_groups: + - name: gke_code_snippets_task_group + <<: *setup_and_teardown_group_gke_code_snippets + max_hosts: -1 + tasks: + - test_gke_multi_cluster_snippets.sh + - test_gke_multi_cluster_no_mesh_snippets.sh + + - name: kind_code_snippets_task_group + <<: *setup_and_teardown_group_kind_code_snippets + max_hosts: -1 + tasks: + - test_kind_search_community_snippets.sh + +buildvariants: + # These variants are used to test the code snippets and each one can be used in patches + # Prerelease is especially used when the repo is tagged + # More details in the TD: https://docs.google.com/document/d/1fuTxfRtP8QPtn7sKYxQM_AGcD6xycTZH8svngGxyKhc/edit?tab=t.0#bookmark=id.e8uva0393mbe + - name: public_gke_code_snippets + display_name: public_gke_code_snippets + allowed_requesters: [ "patch" ] + run_on: + - ubuntu2204-small + tasks: + - name: gke_code_snippets_task_group + + - name: prerelease_gke_code_snippets + display_name: prerelease_gke_code_snippets + tags: [ "release" ] + allowed_requesters: [ "patch", "github_tag" ] + depends_on: + - variant: release_images + name: '*' + patch_optional: true + run_on: + - ubuntu2204-small + tasks: + - name: gke_code_snippets_task_group + + - name: private_gke_code_snippets + display_name: private_gke_code_snippets + allowed_requesters: [ "patch" ] + run_on: + - ubuntu2204-small + <<: *base_om8_dependency + tasks: + - name: gke_code_snippets_task_group + + - name: private_kind_code_snippets + display_name: private_kind_code_snippets + tags: [ "e2e_test_suite" ] + allowed_requesters: [ "patch", "github_pr" ] + run_on: + - ubuntu2204-large + <<: *base_om8_dependency + tasks: + - name: kind_code_snippets_task_group + + - name: prerelease_kind_code_snippets + display_name: prerelease_kind_code_snippets + allowed_requesters: [ "patch" ] + run_on: + - ubuntu2204-large + tasks: + - name: kind_code_snippets_task_group + + - name: public_kind_code_snippets + display_name: public_kind_code_snippets + allowed_requesters: [ "patch" ] + run_on: + - ubuntu2204-large + tasks: + - name: kind_code_snippets_task_group diff --git a/.evergreen.yml b/.evergreen.yml index b0093f5a9..d4f9a4b6b 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -5,6 +5,7 @@ include: - filename: .evergreen-functions.yml - filename: .evergreen-tasks.yml - filename: .evergreen-mco.yml + - filename: .evergreen-snippets.yml variables: - &ops_manager_60_latest 6.0.27 # The order/index is important, since these are anchors. Please do not change @@ -86,29 +87,6 @@ variables: - func: setup_building_host - func: build_multi_cluster_binary - - &setup_and_teardown_group_gke_code_snippets - setup_task_can_fail_task: true - setup_group: - - func: clone - - func: setup_gcloud_cli - - func: setup_mongosh - - func: download_kube_tools - - func: build_multi_cluster_binary - teardown_group: - - func: upload_code_snippets_logs - - - &setup_and_teardown_group_kind_code_snippets - setup_task_can_fail_task: true - setup_group: - - func: clone - - func: cleanup_exec_environment - - func: download_kube_tools - - func: configure_docker_auth - - func: setup_kubernetes_environment - teardown_task: - - func: upload_e2e_logs - - func: upload_code_snippets_logs - - &setup_and_teardown_task_cloudqa setup_task_can_fail_task: true setup_task: @@ -172,6 +150,7 @@ variables: - name: build_init_om_images_ubi variant: init_test_run + # Any change to base_om8_dependency should be reflected to its copy in .evergreen-snippets.yml - &base_om8_dependency depends_on: - name: build_om_images @@ -667,19 +646,6 @@ task_groups: - unit_tests_python - sbom_tests - - name: gke_code_snippets_task_group - <<: *setup_and_teardown_group_gke_code_snippets - max_hosts: -1 - tasks: - - task_gke_multi_cluster_snippets - - task_gke_multi_cluster_no_mesh_snippets - - - name: kind_code_snippets_task_group - <<: *setup_and_teardown_group_kind_code_snippets - max_hosts: -1 - tasks: - - task_kind_community_search_snippets - # Task group for deploying mongodbcommunity resources and testing the (former) MCO - name: e2e_mdb_community_task_group max_hosts: -1 @@ -1994,65 +1960,6 @@ buildvariants: tasks: - name: release_all_currently_used_agents_on_ecr - # These variants are used to test the code snippets and each one can be used in patches - # Prerelease is especially used when the repo is tagged - # More details in the TD: https://docs.google.com/document/d/1fuTxfRtP8QPtn7sKYxQM_AGcD6xycTZH8svngGxyKhc/edit?tab=t.0#bookmark=id.e8uva0393mbe - - name: public_gke_code_snippets - display_name: public_gke_code_snippets - allowed_requesters: ["patch"] - run_on: - - ubuntu2204-small - tasks: - - name: gke_code_snippets_task_group - - - name: prerelease_gke_code_snippets - display_name: prerelease_gke_code_snippets - tags: [ "release" ] - allowed_requesters: ["patch", "github_tag"] - depends_on: - - variant: release_images - name: '*' - patch_optional: true - run_on: - - ubuntu2204-small - tasks: - - name: gke_code_snippets_task_group - - - name: private_gke_code_snippets - display_name: private_gke_code_snippets - allowed_requesters: ["patch"] - run_on: - - ubuntu2204-small - <<: *base_om8_dependency - tasks: - - name: gke_code_snippets_task_group - - - name: private_kind_code_snippets - display_name: private_kind_code_snippets - tags: [ "e2e_test_suite" ] - allowed_requesters: ["patch", "github_pr"] - run_on: - - ubuntu2204-large - <<: *base_om8_dependency - tasks: - - name: kind_code_snippets_task_group - - - name: prerelease_kind_code_snippets - display_name: prerelease_kind_code_snippets - allowed_requesters: ["patch"] - run_on: - - ubuntu2204-large - tasks: - - name: kind_code_snippets_task_group - - - name: public_kind_code_snippets - display_name: public_kind_code_snippets - allowed_requesters: ["patch"] - run_on: - - ubuntu2204-large - tasks: - - name: kind_code_snippets_task_group - ### Build variants for manual patch only - name: backup_csv_images diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 681e2e229..e885c25f5 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -163,6 +163,10 @@ lint_code() { scripts/evergreen/lint_code.sh } +function validate_snippets() { + scripts/code_snippets/validate_snippets.py +} + # bg_job_ vars are global; run_job_in_background function is appending to them on each call bg_job_pids=() bg_job_pids_with_names=() @@ -217,6 +221,7 @@ pre_commit() { run_job_in_background "regenerate_public_rbac_multi_cluster" run_job_in_background "python_formatting" run_job_in_background "check_erroneous_kubebuilder_annotations" + run_job_in_background "validate_snippets" if wait_for_all_background_jobs; then echo -e "${GREEN}pre-commit: All checks passed!${NO_COLOR}" diff --git a/.gitignore b/.gitignore index ec7ebbab0..43e5d90b1 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,5 @@ docs/**/test.sh.run.log # goreleaser generated files dist +logs +*.run.log diff --git a/docs/community-search/quick-start/code_snippets/0045_create_namespaces.sh b/docs/community-search/quick-start/code_snippets/0045_create_namespaces.sh old mode 100755 new mode 100644 diff --git a/docs/community-search/quick-start/code_snippets/0046_create_image_pull_secrets.sh b/docs/community-search/quick-start/code_snippets/0046_create_image_pull_secrets.sh old mode 100755 new mode 100644 diff --git a/docs/community-search/quick-start/community_search_snippets_test.sh.run.log b/docs/community-search/quick-start/community_search_snippets_test.sh.run.log deleted file mode 100644 index 643009e51..000000000 --- a/docs/community-search/quick-start/community_search_snippets_test.sh.run.log +++ /dev/null @@ -1,16 +0,0 @@ -090_helm_add_mogodb_repo -0100_install_operator -0200_configure_community_search_pullsecret -0210_verify_community_search_pullsecret -0305_create_mongodb_community_user_secrets -0310_create_mongodb_community_resource -0315_wait_for_community_resource -0320_create_mongodb_search_resource -0325_wait_for_search_resource -0330_wait_for_community_resource -0335_show_running_pods -0410_run_mongodb_tools_pod -0420_import_movies_mflix_database -0430_create_search_index -0440_wait_for_search_index_ready -0450_execute_search_query diff --git a/docs/community-search/quick-start/output/0200_configure_community_search_pullsecret.out b/docs/community-search/quick-start/output/0200_configure_community_search_pullsecret.out deleted file mode 100644 index c04db5317..000000000 --- a/docs/community-search/quick-start/output/0200_configure_community_search_pullsecret.out +++ /dev/null @@ -1,18 +0,0 @@ -secret/community-private-preview-pullsecret created -serviceaccount/mongodb-kubernetes-database-pods patched -ServiceAccount mongodb-kubernetes-database-pods has been patched: -apiVersion: v1 -imagePullSecrets: -- name: community-private-preview-pullsecret -kind: ServiceAccount -metadata: - annotations: - meta.helm.sh/release-name: mongodb-kubernetes - meta.helm.sh/release-namespace: mongodb - creationTimestamp: "2025-07-08T07:04:51Z" - labels: - app.kubernetes.io/managed-by: Helm - name: mongodb-kubernetes-database-pods - namespace: mongodb - resourceVersion: "902" - uid: 69ba91c9-2032-48dd-8490-b1b6b1c82625 diff --git a/docs/community-search/quick-start/output/0210_verify_community_search_pullsecret.out b/docs/community-search/quick-start/output/0210_verify_community_search_pullsecret.out deleted file mode 100644 index 80aafdc2d..000000000 --- a/docs/community-search/quick-start/output/0210_verify_community_search_pullsecret.out +++ /dev/null @@ -1,3 +0,0 @@ -Verifying mongodb-kubernetes-database-pods service account contains proper pull secret -{"name":"community-private-preview-pullsecret"} -SUCCESS: mongodb-kubernetes-database-pods service account contains proper pull secret diff --git a/docs/community-search/quick-start/output/0335_show_running_pods.out b/docs/community-search/quick-start/output/0335_show_running_pods.out deleted file mode 100644 index bca15125b..000000000 --- a/docs/community-search/quick-start/output/0335_show_running_pods.out +++ /dev/null @@ -1,16 +0,0 @@ - -MongoDBCommunity resource -NAME PHASE VERSION -mdbc-rs Running 8.0.6 - -MongoDBSearch resource -NAME PHASE AGE -mdbc-rs Running 5m21s - -Pods running in cluster kind-kind -NAME READY STATUS RESTARTS AGE -mdbc-rs-0 2/2 Running 1 (35s ago) 7m51s -mdbc-rs-1 2/2 Running 1 (3m11s ago) 6m45s -mdbc-rs-2 2/2 Running 1 (114s ago) 5m57s -mdbc-rs-search-0 1/1 Running 0 5m21s -mongodb-kubernetes-operator-64d5b47b46-fd6nr 1/1 Running 0 7m54s diff --git a/docs/community-search/quick-start/output/0440_wait_for_search_index_ready.out b/docs/community-search/quick-start/output/0440_wait_for_search_index_ready.out deleted file mode 100644 index 17d0d593b..000000000 --- a/docs/community-search/quick-start/output/0440_wait_for_search_index_ready.out +++ /dev/null @@ -1,4 +0,0 @@ -Search index is not ready yet: status=BUILDING -Search index is not ready yet: status=BUILDING -Search index is not ready yet: status=BUILDING -Search index is ready. diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/output/1210_verify_mongosh_connection.out b/public/architectures/mongodb-replicaset-mc-no-mesh/output/1210_verify_mongosh_connection.out deleted file mode 100644 index 15875e92a..000000000 --- a/public/architectures/mongodb-replicaset-mc-no-mesh/output/1210_verify_mongosh_connection.out +++ /dev/null @@ -1,15 +0,0 @@ -{ - authInfo: { - authenticatedUsers: [ { user: 'rs-user', db: 'admin' } ], - authenticatedUserRoles: [ { role: 'root', db: 'admin' } ] - }, - ok: 1, - '$clusterTime': { - clusterTime: Timestamp({ t: 1751960325, i: 1 }), - signature: { - hash: Binary.createFromBase64('1zdo7WUvUyl6qvurToyZCoOwmdY=', 0), - keyId: Long('7524612286879629318') - } - }, - operationTime: Timestamp({ t: 1751960325, i: 1 }) -} diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/test.sh b/public/architectures/mongodb-replicaset-mc-no-mesh/test.sh deleted file mode 100755 index 4b7622391..000000000 --- a/public/architectures/mongodb-replicaset-mc-no-mesh/test.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 1050_generate_certs.sh -run 1100_mongodb_replicaset_multi_cluster.sh -run 1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh - -run 1200_create_mongodb_user.sh -sleep 10 -run_for_output 1210_verify_mongosh_connection.sh - -popd diff --git a/public/architectures/mongodb-replicaset-multi-cluster/output/1210_verify_mongosh_connection.out b/public/architectures/mongodb-replicaset-multi-cluster/output/1210_verify_mongosh_connection.out deleted file mode 100644 index 8fd3ba143..000000000 --- a/public/architectures/mongodb-replicaset-multi-cluster/output/1210_verify_mongosh_connection.out +++ /dev/null @@ -1,15 +0,0 @@ -{ - authInfo: { - authenticatedUsers: [ { user: 'rs-user', db: 'admin' } ], - authenticatedUserRoles: [ { role: 'root', db: 'admin' } ] - }, - ok: 1, - '$clusterTime': { - clusterTime: Timestamp({ t: 1747925179, i: 1 }), - signature: { - hash: Binary.createFromBase64('T1ZP+QUFgBXayfOsRI6XFdEmjKI=', 0), - keyId: Long('7507281432415305733') - } - }, - operationTime: Timestamp({ t: 1747925179, i: 1 }) -} diff --git a/public/architectures/mongodb-replicaset-multi-cluster/test.sh b/public/architectures/mongodb-replicaset-multi-cluster/test.sh deleted file mode 100755 index 4b7622391..000000000 --- a/public/architectures/mongodb-replicaset-multi-cluster/test.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 1050_generate_certs.sh -run 1100_mongodb_replicaset_multi_cluster.sh -run 1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh - -run 1200_create_mongodb_user.sh -sleep 10 -run_for_output 1210_verify_mongosh_connection.sh - -popd diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/output/2210_verify_mongosh_connection.out b/public/architectures/mongodb-sharded-mc-no-mesh/output/2210_verify_mongosh_connection.out deleted file mode 100644 index a1ebea3a0..000000000 --- a/public/architectures/mongodb-sharded-mc-no-mesh/output/2210_verify_mongosh_connection.out +++ /dev/null @@ -1,15 +0,0 @@ -{ - authInfo: { - authenticatedUsers: [ { user: 'sc-user', db: 'admin' } ], - authenticatedUserRoles: [ { role: 'root', db: 'admin' } ] - }, - ok: 1, - '$clusterTime': { - clusterTime: Timestamp({ t: 1751960997, i: 1 }), - signature: { - hash: Binary.createFromBase64('nqvfLcd6LgzPn3D2ZvGFBF6xcdw=', 0), - keyId: Long('7524614838090203143') - } - }, - operationTime: Timestamp({ t: 1751960997, i: 1 }) -} diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/test.sh b/public/architectures/mongodb-sharded-mc-no-mesh/test.sh deleted file mode 100755 index d45db935c..000000000 --- a/public/architectures/mongodb-sharded-mc-no-mesh/test.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 2050_generate_certs.sh -run 2100_mongodb_sharded_multi_cluster.sh -run 2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh - -run 2200_create_mongodb_user.sh -sleep 10 -run_for_output 2210_verify_mongosh_connection.sh - -popd diff --git a/public/architectures/mongodb-sharded-multi-cluster/output/2210_verify_mongosh_connection.out b/public/architectures/mongodb-sharded-multi-cluster/output/2210_verify_mongosh_connection.out deleted file mode 100644 index 664ae8d80..000000000 --- a/public/architectures/mongodb-sharded-multi-cluster/output/2210_verify_mongosh_connection.out +++ /dev/null @@ -1,15 +0,0 @@ -{ - authInfo: { - authenticatedUsers: [ { user: 'sc-user', db: 'admin' } ], - authenticatedUserRoles: [ { role: 'root', db: 'admin' } ] - }, - ok: 1, - '$clusterTime': { - clusterTime: Timestamp({ t: 1747926002, i: 2 }), - signature: { - hash: Binary.createFromBase64('txVMxsU5ZT7eK/o9G3nqe96BdiY=', 0), - keyId: Long('7507284709475352599') - } - }, - operationTime: Timestamp({ t: 1747926002, i: 2 }) -} diff --git a/public/architectures/mongodb-sharded-multi-cluster/test.sh b/public/architectures/mongodb-sharded-multi-cluster/test.sh deleted file mode 100755 index d45db935c..000000000 --- a/public/architectures/mongodb-sharded-multi-cluster/test.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 2050_generate_certs.sh -run 2100_mongodb_sharded_multi_cluster.sh -run 2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh - -run 2200_create_mongodb_user.sh -sleep 10 -run_for_output 2210_verify_mongosh_connection.sh - -popd diff --git a/public/architectures/ops-manager-mc-no-mesh/output/0150_om_load_balancer.out b/public/architectures/ops-manager-mc-no-mesh/output/0150_om_load_balancer.out deleted file mode 100644 index 2c9773b92..000000000 --- a/public/architectures/ops-manager-mc-no-mesh/output/0150_om_load_balancer.out +++ /dev/null @@ -1,10 +0,0 @@ -NAME NETWORK DIRECTION PRIORITY ALLOW DENY DISABLED -fw-ops-manager-hc default INGRESS 1000 tcp:8443 False -NAME PROTOCOL -om-healthcheck HTTPS -NAME BACKENDS PROTOCOL -om-backend-service HTTPS -NAME DEFAULT_SERVICE -om-url-map backendServices/om-backend-service -NAME SSL_CERTIFICATES URL_MAP REGION CERTIFICATE_MAP -om-lb-proxy om-certificate om-url-map diff --git a/public/architectures/ops-manager-mc-no-mesh/output/0330_ops_manager_wait_for_running_state.out b/public/architectures/ops-manager-mc-no-mesh/output/0330_ops_manager_wait_for_running_state.out deleted file mode 100644 index 7230ebd38..000000000 --- a/public/architectures/ops-manager-mc-no-mesh/output/0330_ops_manager_wait_for_running_state.out +++ /dev/null @@ -1,22 +0,0 @@ -Waiting for Application Database to reach Running phase... -mongodbopsmanager.mongodb.com/om condition met - -Waiting for Ops Manager to reach Running phase... -mongodbopsmanager.mongodb.com/om condition met - -MongoDBOpsManager resource -NAME REPLICAS VERSION STATE (OPSMANAGER) STATE (APPDB) STATE (BACKUP) AGE WARNINGS -om 8.0.5 Running Running Disabled 16m - -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 -NAME READY STATUS RESTARTS AGE -om-0-0 1/1 Running 0 12m -om-db-0-0 3/3 Running 0 3m49s -om-db-0-1 3/3 Running 0 4m51s - -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-686cc1e099f9ef000722c191-862 -NAME READY STATUS RESTARTS AGE -om-1-0 1/1 Running 0 12m -om-1-1 1/1 Running 0 8m -om-db-1-0 3/3 Running 0 106s -om-db-1-1 3/3 Running 0 2m50s diff --git a/public/architectures/ops-manager-mc-no-mesh/output/0522_ops_manager_wait_for_running_state.out b/public/architectures/ops-manager-mc-no-mesh/output/0522_ops_manager_wait_for_running_state.out deleted file mode 100644 index b28afaad6..000000000 --- a/public/architectures/ops-manager-mc-no-mesh/output/0522_ops_manager_wait_for_running_state.out +++ /dev/null @@ -1,30 +0,0 @@ - -Waiting for Backup to reach Running phase... -mongodbopsmanager.mongodb.com/om condition met -Waiting for Application Database to reach Running phase... -mongodbopsmanager.mongodb.com/om condition met - -Waiting for Ops Manager to reach Running phase... -mongodbopsmanager.mongodb.com/om condition met - -MongoDBOpsManager resource -NAME REPLICAS VERSION STATE (OPSMANAGER) STATE (APPDB) STATE (BACKUP) AGE WARNINGS -om 8.0.5 Running Running Running 20m - -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 -NAME READY STATUS RESTARTS AGE -om-0-0 1/1 Running 0 16m -om-db-0-0 3/3 Running 0 8m3s -om-db-0-1 3/3 Running 0 9m5s - -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-686cc1e099f9ef000722c191-862 -NAME READY STATUS RESTARTS AGE -om-1-0 1/1 Running 0 16m -om-1-1 1/1 Running 0 12m -om-db-1-0 3/3 Running 0 6m -om-db-1-1 3/3 Running 0 7m4s - -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-686cc1e099f9ef000722c191-862 -NAME READY STATUS RESTARTS AGE -om-2-backup-daemon-0 1/1 Running 0 3m50s -om-db-2-0 3/3 Running 0 5m1s diff --git a/public/architectures/ops-manager-mc-no-mesh/test.sh b/public/architectures/ops-manager-mc-no-mesh/test.sh deleted file mode 100755 index 4c8e92a6f..000000000 --- a/public/architectures/ops-manager-mc-no-mesh/test.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 0100_generate_certs.sh -run 0110_add_cert_to_gcp.sh - -run_for_output 0150_om_load_balancer.sh - -run 0160_add_dns_record.sh - -run 0300_ops_manager_create_admin_credentials.sh - -run 0320_ops_manager_no_mesh.sh - -run_for_output 0321_ops_manager_wait_for_pending_state.sh - -run 0325_set_up_lb_services.sh -run 0326_set_up_lb_services.sh - -run_for_output 0330_ops_manager_wait_for_running_state.sh - -run 0400_install_minio_s3.sh -run 0500_ops_manager_prepare_s3_backup_secrets.sh -run 0510_ops_manager_enable_s3_backup.sh -run_for_output 0522_ops_manager_wait_for_running_state.sh - -run 0610_create_mdb_org_and_get_credentials.sh - -popd diff --git a/public/architectures/ops-manager-multi-cluster/output/0321_ops_manager_wait_for_pending_state.out b/public/architectures/ops-manager-multi-cluster/output/0321_ops_manager_wait_for_pending_state.out deleted file mode 100644 index 0e3908c8c..000000000 --- a/public/architectures/ops-manager-multi-cluster/output/0321_ops_manager_wait_for_pending_state.out +++ /dev/null @@ -1,4 +0,0 @@ -Waiting for Application Database to reach Pending phase... -mongodbopsmanager.mongodb.com/om condition met -Waiting for Ops Manager to reach Pending phase... -mongodbopsmanager.mongodb.com/om condition met diff --git a/public/architectures/ops-manager-multi-cluster/test.sh b/public/architectures/ops-manager-multi-cluster/test.sh deleted file mode 100755 index 760f5837e..000000000 --- a/public/architectures/ops-manager-multi-cluster/test.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 0250_generate_certs.sh - -run 0300_ops_manager_create_admin_credentials.sh -run 0310_ops_manager_deploy_on_single_member_cluster.sh -run_for_output 0311_ops_manager_wait_for_pending_state.sh -run_for_output 0312_ops_manager_wait_for_running_state.sh -run 0320_ops_manager_add_second_cluster.sh -run_for_output 0321_ops_manager_wait_for_pending_state.sh -run_for_output 0322_ops_manager_wait_for_running_state.sh - -run 0400_install_minio_s3.sh -run 0500_ops_manager_prepare_s3_backup_secrets.sh -run 0510_ops_manager_enable_s3_backup.sh -run_for_output 0522_ops_manager_wait_for_running_state.sh - -run 0610_create_mdb_org_and_get_credentials.sh - -popd diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0250_generate_certs.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0250_generate_certs.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0250_generate_certs.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0250_generate_certs.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0300_ops_manager_create_admin_credentials.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0300_ops_manager_create_admin_credentials.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0300_ops_manager_create_admin_credentials.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0300_ops_manager_create_admin_credentials.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0310_ops_manager_deploy_on_single_member_cluster.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0310_ops_manager_deploy_on_single_member_cluster.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0310_ops_manager_deploy_on_single_member_cluster.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0310_ops_manager_deploy_on_single_member_cluster.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0311_ops_manager_wait_for_pending_state.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0311_ops_manager_wait_for_pending_state.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0311_ops_manager_wait_for_pending_state.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0311_ops_manager_wait_for_pending_state.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0330_ops_manager_wait_for_running_state.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0312_ops_manager_wait_for_running_state.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0330_ops_manager_wait_for_running_state.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0312_ops_manager_wait_for_running_state.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0320_ops_manager_add_second_cluster.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0320_ops_manager_add_second_cluster.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0320_ops_manager_add_second_cluster.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0320_ops_manager_add_second_cluster.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0321_ops_manager_wait_for_pending_state.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0321_ops_manager_wait_for_pending_state.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0321_ops_manager_wait_for_pending_state.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0321_ops_manager_wait_for_pending_state.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0322_ops_manager_wait_for_running_state.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0322_ops_manager_wait_for_running_state.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0322_ops_manager_wait_for_running_state.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0322_ops_manager_wait_for_running_state.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0400_install_minio_s3.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0400_install_minio_s3.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0400_install_minio_s3.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0400_install_minio_s3.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0500_ops_manager_prepare_s3_backup_secrets.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0500_ops_manager_prepare_s3_backup_secrets.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0500_ops_manager_prepare_s3_backup_secrets.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0500_ops_manager_prepare_s3_backup_secrets.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0510_ops_manager_enable_s3_backup.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0510_ops_manager_enable_s3_backup.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0510_ops_manager_enable_s3_backup.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0510_ops_manager_enable_s3_backup.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0522_ops_manager_wait_for_running_state.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0522_ops_manager_wait_for_running_state.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0522_ops_manager_wait_for_running_state.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0522_ops_manager_wait_for_running_state.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0610_create_mdb_org_and_get_credentials.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0610_create_mdb_org_and_get_credentials.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0610_create_mdb_org_and_get_credentials.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_0610_create_mdb_org_and_get_credentials.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/9100_delete_backup_namespaces.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_9100_delete_backup_namespaces.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/9100_delete_backup_namespaces.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_9100_delete_backup_namespaces.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/9200_delete_om.sh b/public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_9200_delete_om.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/9200_delete_om.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/code_snippets/ra-06_9200_delete_om.sh diff --git a/public/architectures/ops-manager-multi-cluster/env_variables.sh b/public/architectures/ra-06-ops-manager-multi-cluster/env_variables.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/env_variables.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/env_variables.sh diff --git a/public/architectures/ops-manager-multi-cluster/teardown.sh b/public/architectures/ra-06-ops-manager-multi-cluster/teardown.sh similarity index 75% rename from public/architectures/ops-manager-multi-cluster/teardown.sh rename to public/architectures/ra-06-ops-manager-multi-cluster/teardown.sh index cb0389a60..573a27b4a 100755 --- a/public/architectures/ops-manager-multi-cluster/teardown.sh +++ b/public/architectures/ra-06-ops-manager-multi-cluster/teardown.sh @@ -11,8 +11,8 @@ pushd "${script_dir}" prepare_snippets -run 9100_delete_backup_namespaces.sh & -run 9200_delete_om.sh & +run ra-06_9100_delete_backup_namespaces.sh & +run ra-06_9200_delete_om.sh & wait popd diff --git a/public/architectures/ra-06-ops-manager-multi-cluster/test.sh b/public/architectures/ra-06-ops-manager-multi-cluster/test.sh new file mode 100755 index 000000000..eb08178f3 --- /dev/null +++ b/public/architectures/ra-06-ops-manager-multi-cluster/test.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-06_0250_generate_certs.sh + +run ra-06_0300_ops_manager_create_admin_credentials.sh +run ra-06_0310_ops_manager_deploy_on_single_member_cluster.sh +run_for_output ra-06_0311_ops_manager_wait_for_pending_state.sh +run_for_output ra-06_0312_ops_manager_wait_for_running_state.sh +run ra-06_0320_ops_manager_add_second_cluster.sh +run_for_output ra-06_0321_ops_manager_wait_for_pending_state.sh +run_for_output ra-06_0322_ops_manager_wait_for_running_state.sh + +run ra-06_0400_install_minio_s3.sh +run ra-06_0500_ops_manager_prepare_s3_backup_secrets.sh +run ra-06_0510_ops_manager_enable_s3_backup.sh +run_for_output ra-06_0522_ops_manager_wait_for_running_state.sh + +run ra-06_0610_create_mdb_org_and_get_credentials.sh + +popd diff --git a/public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1050_generate_certs.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1050_generate_certs.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1050_generate_certs.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1050_generate_certs.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1100_mongodb_replicaset_multi_cluster.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1100_mongodb_replicaset_multi_cluster.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1100_mongodb_replicaset_multi_cluster.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1100_mongodb_replicaset_multi_cluster.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1200_create_mongodb_user.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1200_create_mongodb_user.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1200_create_mongodb_user.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1200_create_mongodb_user.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1210_verify_mongosh_connection.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1210_verify_mongosh_connection.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1210_verify_mongosh_connection.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_1210_verify_mongosh_connection.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/9000_delete_resources.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_9000_delete_resources.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/9000_delete_resources.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/code_snippets/ra-07_9000_delete_resources.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/env_variables.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/env_variables.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/env_variables.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/env_variables.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/teardown.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/teardown.sh similarity index 86% rename from public/architectures/mongodb-replicaset-mc-no-mesh/teardown.sh rename to public/architectures/ra-07-mongodb-replicaset-multi-cluster/teardown.sh index dd5dd71a8..7695b3849 100755 --- a/public/architectures/mongodb-replicaset-mc-no-mesh/teardown.sh +++ b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/teardown.sh @@ -11,6 +11,6 @@ pushd "${script_dir}" prepare_snippets -run 9000_delete_resources.sh +run ra-07_9000_delete_resources.sh popd diff --git a/public/architectures/ra-07-mongodb-replicaset-multi-cluster/test.sh b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/test.sh new file mode 100755 index 000000000..a49ca11f3 --- /dev/null +++ b/public/architectures/ra-07-mongodb-replicaset-multi-cluster/test.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-07_1050_generate_certs.sh +run ra-07_1100_mongodb_replicaset_multi_cluster.sh +run ra-07_1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh + +run ra-07_1200_create_mongodb_user.sh +sleep 10 +run_for_output ra-07_1210_verify_mongosh_connection.sh + +popd diff --git a/public/architectures/mongodb-sharded-multi-cluster/code_snippets/2050_generate_certs.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2050_generate_certs.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/code_snippets/2050_generate_certs.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2050_generate_certs.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/code_snippets/2100_mongodb_sharded_multi_cluster.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2100_mongodb_sharded_multi_cluster.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/code_snippets/2100_mongodb_sharded_multi_cluster.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2100_mongodb_sharded_multi_cluster.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2200_create_mongodb_user.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2200_create_mongodb_user.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2200_create_mongodb_user.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2200_create_mongodb_user.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2210_verify_mongosh_connection.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2210_verify_mongosh_connection.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2210_verify_mongosh_connection.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_2210_verify_mongosh_connection.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/9000_delete_resources.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_9000_delete_resources.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/9000_delete_resources.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/code_snippets/ra-08_9000_delete_resources.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/env_variables.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/env_variables.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/env_variables.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/env_variables.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/teardown.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/teardown.sh similarity index 86% rename from public/architectures/mongodb-sharded-mc-no-mesh/teardown.sh rename to public/architectures/ra-08-mongodb-sharded-multi-cluster/teardown.sh index dd5dd71a8..9b70289c8 100755 --- a/public/architectures/mongodb-sharded-mc-no-mesh/teardown.sh +++ b/public/architectures/ra-08-mongodb-sharded-multi-cluster/teardown.sh @@ -11,6 +11,6 @@ pushd "${script_dir}" prepare_snippets -run 9000_delete_resources.sh +run ra-08_9000_delete_resources.sh popd diff --git a/public/architectures/ra-08-mongodb-sharded-multi-cluster/test.sh b/public/architectures/ra-08-mongodb-sharded-multi-cluster/test.sh new file mode 100755 index 000000000..3c3a49294 --- /dev/null +++ b/public/architectures/ra-08-mongodb-sharded-multi-cluster/test.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-08_2050_generate_certs.sh +run ra-08_2100_mongodb_sharded_multi_cluster.sh +run ra-08_2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh + +run ra-08_2200_create_mongodb_user.sh +sleep 10 +run_for_output ra-08_2210_verify_mongosh_connection.sh + +popd diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0100_generate_certs.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0100_generate_certs.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0100_generate_certs.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0100_generate_certs.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0110_add_cert_to_gcp.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0110_add_cert_to_gcp.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0110_add_cert_to_gcp.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0110_add_cert_to_gcp.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0150_om_load_balancer.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0150_om_load_balancer.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0150_om_load_balancer.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0150_om_load_balancer.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0160_add_dns_record.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0160_add_dns_record.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0160_add_dns_record.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0160_add_dns_record.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0300_ops_manager_create_admin_credentials.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0300_ops_manager_create_admin_credentials.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0300_ops_manager_create_admin_credentials.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0300_ops_manager_create_admin_credentials.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0320_ops_manager_no_mesh.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0320_ops_manager_no_mesh.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0320_ops_manager_no_mesh.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0320_ops_manager_no_mesh.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0321_ops_manager_wait_for_pending_state.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0321_ops_manager_wait_for_pending_state.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0321_ops_manager_wait_for_pending_state.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0321_ops_manager_wait_for_pending_state.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0325_set_up_lb_services.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0325_set_up_lb_services.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0325_set_up_lb_services.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0325_set_up_lb_services.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0326_set_up_lb_services.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0326_set_up_lb_services.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0326_set_up_lb_services.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0326_set_up_lb_services.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0312_ops_manager_wait_for_running_state.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0330_ops_manager_wait_for_running_state.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0312_ops_manager_wait_for_running_state.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0330_ops_manager_wait_for_running_state.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0400_install_minio_s3.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0400_install_minio_s3.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0400_install_minio_s3.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0400_install_minio_s3.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0500_ops_manager_prepare_s3_backup_secrets.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0500_ops_manager_prepare_s3_backup_secrets.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0500_ops_manager_prepare_s3_backup_secrets.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0500_ops_manager_prepare_s3_backup_secrets.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0510_ops_manager_enable_s3_backup.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0510_ops_manager_enable_s3_backup.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0510_ops_manager_enable_s3_backup.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0510_ops_manager_enable_s3_backup.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/0522_ops_manager_wait_for_running_state.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0522_ops_manager_wait_for_running_state.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/0522_ops_manager_wait_for_running_state.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0522_ops_manager_wait_for_running_state.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/0610_create_mdb_org_and_get_credentials.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0610_create_mdb_org_and_get_credentials.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/0610_create_mdb_org_and_get_credentials.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_0610_create_mdb_org_and_get_credentials.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/code_snippets/9000_cleanup_gke_lb.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_9000_cleanup_gke_lb.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/code_snippets/9000_cleanup_gke_lb.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_9000_cleanup_gke_lb.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/9100_delete_backup_namespaces.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_9100_delete_backup_namespaces.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/9100_delete_backup_namespaces.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_9100_delete_backup_namespaces.sh diff --git a/public/architectures/ops-manager-multi-cluster/code_snippets/9200_delete_om.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_9200_delete_om.sh similarity index 100% rename from public/architectures/ops-manager-multi-cluster/code_snippets/9200_delete_om.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/code_snippets/ra-10_9200_delete_om.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/env_variables.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/env_variables.sh similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/env_variables.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/env_variables.sh diff --git a/public/architectures/ops-manager-mc-no-mesh/teardown.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/teardown.sh similarity index 67% rename from public/architectures/ops-manager-mc-no-mesh/teardown.sh rename to public/architectures/ra-10-ops-manager-mc-no-mesh/teardown.sh index 7719fa13d..c6060f0b1 100755 --- a/public/architectures/ops-manager-mc-no-mesh/teardown.sh +++ b/public/architectures/ra-10-ops-manager-mc-no-mesh/teardown.sh @@ -11,9 +11,9 @@ pushd "${script_dir}" prepare_snippets -run 9000_cleanup_gke_lb.sh & -run 9100_delete_backup_namespaces.sh & -run 9200_delete_om.sh & +run ra-10_9000_cleanup_gke_lb.sh & +run ra-10_9100_delete_backup_namespaces.sh & +run ra-10_9200_delete_om.sh & wait popd diff --git a/public/architectures/ra-10-ops-manager-mc-no-mesh/test.sh b/public/architectures/ra-10-ops-manager-mc-no-mesh/test.sh new file mode 100755 index 000000000..ff7731845 --- /dev/null +++ b/public/architectures/ra-10-ops-manager-mc-no-mesh/test.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-10_0100_generate_certs.sh +sleep 10 # wait for cert-manager to generate secrets + +run ra-10_0110_add_cert_to_gcp.sh + +run_for_output ra-10_0150_om_load_balancer.sh + +run ra-10_0160_add_dns_record.sh + +run ra-10_0300_ops_manager_create_admin_credentials.sh + +run ra-10_0320_ops_manager_no_mesh.sh + +run_for_output ra-10_0321_ops_manager_wait_for_pending_state.sh + +run ra-10_0325_set_up_lb_services.sh +run ra-10_0326_set_up_lb_services.sh + +run_for_output ra-10_0330_ops_manager_wait_for_running_state.sh + +run ra-10_0400_install_minio_s3.sh +run ra-10_0500_ops_manager_prepare_s3_backup_secrets.sh +run ra-10_0510_ops_manager_enable_s3_backup.sh +run_for_output ra-10_0522_ops_manager_wait_for_running_state.sh + +run ra-10_0610_create_mdb_org_and_get_credentials.sh + +popd diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2050_generate_certs.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2050_generate_certs.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2050_generate_certs.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2050_generate_certs.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2100_mongodb_sharded_multi_cluster.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2100_mongodb_sharded_multi_cluster.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/code_snippets/2100_mongodb_sharded_multi_cluster.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2100_mongodb_sharded_multi_cluster.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/code_snippets/2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/code_snippets/2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/code_snippets/2200_create_mongodb_user.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2200_create_mongodb_user.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/code_snippets/2200_create_mongodb_user.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2200_create_mongodb_user.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/code_snippets/2210_verify_mongosh_connection.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2210_verify_mongosh_connection.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/code_snippets/2210_verify_mongosh_connection.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_2210_verify_mongosh_connection.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/code_snippets/9000_delete_resources.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_9000_delete_resources.sh similarity index 100% rename from public/architectures/mongodb-sharded-multi-cluster/code_snippets/9000_delete_resources.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/code_snippets/ra-11_9000_delete_resources.sh diff --git a/public/architectures/mongodb-sharded-mc-no-mesh/env_variables.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/env_variables.sh similarity index 100% rename from public/architectures/mongodb-sharded-mc-no-mesh/env_variables.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/env_variables.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/teardown.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/teardown.sh similarity index 86% rename from public/architectures/mongodb-replicaset-multi-cluster/teardown.sh rename to public/architectures/ra-11-mongodb-sharded-mc-no-mesh/teardown.sh index dd5dd71a8..d9423a9cd 100755 --- a/public/architectures/mongodb-replicaset-multi-cluster/teardown.sh +++ b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/teardown.sh @@ -11,6 +11,6 @@ pushd "${script_dir}" prepare_snippets -run 9000_delete_resources.sh +run ra-11_9000_delete_resources.sh popd diff --git a/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/test.sh b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/test.sh new file mode 100755 index 000000000..917f85714 --- /dev/null +++ b/public/architectures/ra-11-mongodb-sharded-mc-no-mesh/test.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-11_2050_generate_certs.sh +run ra-11_2100_mongodb_sharded_multi_cluster.sh +run ra-11_2110_mongodb_sharded_multi_cluster_wait_for_running_state.sh + +run ra-11_2200_create_mongodb_user.sh +sleep 10 +run_for_output ra-11_2210_verify_mongosh_connection.sh + +popd diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1050_generate_certs.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1050_generate_certs.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1050_generate_certs.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1050_generate_certs.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1100_mongodb_replicaset_multi_cluster.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1100_mongodb_replicaset_multi_cluster.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/code_snippets/1100_mongodb_replicaset_multi_cluster.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1100_mongodb_replicaset_multi_cluster.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1200_create_mongodb_user.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1200_create_mongodb_user.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1200_create_mongodb_user.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1200_create_mongodb_user.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1210_verify_mongosh_connection.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1210_verify_mongosh_connection.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/code_snippets/1210_verify_mongosh_connection.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_1210_verify_mongosh_connection.sh diff --git a/public/architectures/mongodb-replicaset-multi-cluster/code_snippets/9000_delete_resources.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_9000_delete_resources.sh similarity index 100% rename from public/architectures/mongodb-replicaset-multi-cluster/code_snippets/9000_delete_resources.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/code_snippets/ra-12_9000_delete_resources.sh diff --git a/public/architectures/mongodb-replicaset-mc-no-mesh/env_variables.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/env_variables.sh similarity index 100% rename from public/architectures/mongodb-replicaset-mc-no-mesh/env_variables.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/env_variables.sh diff --git a/public/architectures/mongodb-sharded-multi-cluster/teardown.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/teardown.sh similarity index 86% rename from public/architectures/mongodb-sharded-multi-cluster/teardown.sh rename to public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/teardown.sh index dd5dd71a8..13940afce 100755 --- a/public/architectures/mongodb-sharded-multi-cluster/teardown.sh +++ b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/teardown.sh @@ -11,6 +11,6 @@ pushd "${script_dir}" prepare_snippets -run 9000_delete_resources.sh +run ra-12_9000_delete_resources.sh popd diff --git a/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/test.sh b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/test.sh new file mode 100755 index 000000000..c53de03b1 --- /dev/null +++ b/public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/test.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-12_1050_generate_certs.sh +run ra-12_1100_mongodb_replicaset_multi_cluster.sh +run ra-12_1110_mongodb_replicaset_multi_cluster_wait_for_running_state.sh + +run ra-12_1200_create_mongodb_user.sh +sleep 10 +run_for_output ra-12_1210_verify_mongosh_connection.sh + +popd diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/0005_gcloud_set_current_project.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0005_gcloud_set_current_project.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/0005_gcloud_set_current_project.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0005_gcloud_set_current_project.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/0010_create_gke_cluster_0.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0010_create_gke_cluster_0.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/0010_create_gke_cluster_0.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0010_create_gke_cluster_0.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/0010_create_gke_cluster_1.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0010_create_gke_cluster_1.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/0010_create_gke_cluster_1.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0010_create_gke_cluster_1.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/0010_create_gke_cluster_2.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0010_create_gke_cluster_2.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/0010_create_gke_cluster_2.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0010_create_gke_cluster_2.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/0020_get_gke_credentials.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0020_get_gke_credentials.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/0020_get_gke_credentials.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0020_get_gke_credentials.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/0030_verify_access_to_clusters.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0030_verify_access_to_clusters.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/0030_verify_access_to_clusters.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_0030_verify_access_to_clusters.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/code_snippets/9010_delete_gke_clusters.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_9010_delete_gke_clusters.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/code_snippets/9010_delete_gke_clusters.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/code_snippets/ra-01_9010_delete_gke_clusters.sh diff --git a/public/architectures/setup-multi-cluster/setup-gke/env_variables.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-gke/env_variables.sh rename to public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh diff --git a/public/architectures/setup-multi-cluster/ra-01-setup-gke/teardown.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/teardown.sh new file mode 100755 index 000000000..8aad13311 --- /dev/null +++ b/public/architectures/setup-multi-cluster/ra-01-setup-gke/teardown.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-01_9010_delete_gke_clusters.sh + +popd diff --git a/public/architectures/setup-multi-cluster/ra-01-setup-gke/test.sh b/public/architectures/setup-multi-cluster/ra-01-setup-gke/test.sh new file mode 100755 index 000000000..b38509182 --- /dev/null +++ b/public/architectures/setup-multi-cluster/ra-01-setup-gke/test.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-01_0005_gcloud_set_current_project.sh +run ra-01_0010_create_gke_cluster_0.sh & +run ra-01_0010_create_gke_cluster_1.sh & +run ra-01_0010_create_gke_cluster_2.sh & +wait + +run ra-01_0020_get_gke_credentials.sh +run_for_output ra-01_0030_verify_access_to_clusters.sh + +popd diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0045_create_namespaces.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0045_create_namespaces.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/0045_create_namespaces.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0045_create_namespaces.sh diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0046_create_image_pull_secrets.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0046_create_image_pull_secrets.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/0046_create_image_pull_secrets.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0046_create_image_pull_secrets.sh diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0200_kubectl_mongodb_configure_multi_cluster.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0200_kubectl_mongodb_configure_multi_cluster.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/0200_kubectl_mongodb_configure_multi_cluster.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0200_kubectl_mongodb_configure_multi_cluster.sh diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0205_helm_configure_repo.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0205_helm_configure_repo.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/0205_helm_configure_repo.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0205_helm_configure_repo.sh diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0210_helm_install_operator.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0210_helm_install_operator.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/0210_helm_install_operator.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0210_helm_install_operator.sh diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0211_check_operator_deployment.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0211_check_operator_deployment.sh similarity index 79% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/0211_check_operator_deployment.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0211_check_operator_deployment.sh index fef1f8f27..19f4a121b 100755 --- a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/0211_check_operator_deployment.sh +++ b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_0211_check_operator_deployment.sh @@ -1,4 +1,4 @@ -kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${OPERATOR_NAMESPACE}" rollout status deployment/mongodb-kubernetes-operator-multi-cluster +kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${OPERATOR_NAMESPACE}" rollout status --timeout=2m deployment/mongodb-kubernetes-operator-multi-cluster echo "Operator deployment in ${OPERATOR_NAMESPACE} namespace" kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${OPERATOR_NAMESPACE}" get deployments echo; echo "Operator pod in ${OPERATOR_NAMESPACE} namespace" diff --git a/public/architectures/setup-multi-cluster/setup-operator/code_snippets/9000_delete_namespaces.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_9000_delete_namespaces.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/code_snippets/9000_delete_namespaces.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/code_snippets/ra-02_9000_delete_namespaces.sh diff --git a/public/architectures/setup-multi-cluster/setup-operator/env_variables.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/env_variables.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-operator/env_variables.sh rename to public/architectures/setup-multi-cluster/ra-02-setup-operator/env_variables.sh diff --git a/public/architectures/setup-multi-cluster/ra-02-setup-operator/teardown.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/teardown.sh new file mode 100755 index 000000000..ed888c2dd --- /dev/null +++ b/public/architectures/setup-multi-cluster/ra-02-setup-operator/teardown.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-02_9000_delete_namespaces.sh + +popd diff --git a/public/architectures/setup-multi-cluster/ra-02-setup-operator/test.sh b/public/architectures/setup-multi-cluster/ra-02-setup-operator/test.sh new file mode 100755 index 000000000..aebb69474 --- /dev/null +++ b/public/architectures/setup-multi-cluster/ra-02-setup-operator/test.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-02_0045_create_namespaces.sh +run ra-02_0046_create_image_pull_secrets.sh + +run_for_output ra-02_0200_kubectl_mongodb_configure_multi_cluster.sh +run_for_output ra-02_0205_helm_configure_repo.sh +run_for_output ra-02_0210_helm_install_operator.sh +run_for_output ra-02_0211_check_operator_deployment.sh + +popd diff --git a/public/architectures/setup-multi-cluster/setup-istio/code_snippets/0040_install_istio.sh b/public/architectures/setup-multi-cluster/ra-03-setup-istio/code_snippets/ra-03_0040_install_istio.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-istio/code_snippets/0040_install_istio.sh rename to public/architectures/setup-multi-cluster/ra-03-setup-istio/code_snippets/ra-03_0040_install_istio.sh diff --git a/public/architectures/setup-multi-cluster/setup-istio/code_snippets/0050_label_namespaces.sh b/public/architectures/setup-multi-cluster/ra-03-setup-istio/code_snippets/ra-03_0050_label_namespaces.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-istio/code_snippets/0050_label_namespaces.sh rename to public/architectures/setup-multi-cluster/ra-03-setup-istio/code_snippets/ra-03_0050_label_namespaces.sh diff --git a/public/architectures/setup-multi-cluster/setup-istio/install_istio_separate_network.sh b/public/architectures/setup-multi-cluster/ra-03-setup-istio/install_istio_separate_network.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-istio/install_istio_separate_network.sh rename to public/architectures/setup-multi-cluster/ra-03-setup-istio/install_istio_separate_network.sh diff --git a/public/architectures/setup-multi-cluster/setup-istio/test.sh b/public/architectures/setup-multi-cluster/ra-03-setup-istio/test.sh similarity index 77% rename from public/architectures/setup-multi-cluster/setup-istio/test.sh rename to public/architectures/setup-multi-cluster/ra-03-setup-istio/test.sh index 9d874fdd0..f03d28154 100755 --- a/public/architectures/setup-multi-cluster/setup-istio/test.sh +++ b/public/architectures/setup-multi-cluster/ra-03-setup-istio/test.sh @@ -11,7 +11,7 @@ pushd "${script_dir}" prepare_snippets -run 0040_install_istio.sh -run 0050_label_namespaces.sh +run ra-03_0040_install_istio.sh +run ra-03_0050_label_namespaces.sh popd diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0045_create_connectivity_test_namespaces.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0045_create_connectivity_test_namespaces.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0045_create_connectivity_test_namespaces.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0045_create_connectivity_test_namespaces.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0050_check_cluster_connectivity_create_sts_0.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0050_check_cluster_connectivity_create_sts_0.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0050_check_cluster_connectivity_create_sts_0.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0050_check_cluster_connectivity_create_sts_0.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0050_check_cluster_connectivity_create_sts_1.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0050_check_cluster_connectivity_create_sts_1.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0050_check_cluster_connectivity_create_sts_1.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0050_check_cluster_connectivity_create_sts_1.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0050_check_cluster_connectivity_create_sts_2.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0050_check_cluster_connectivity_create_sts_2.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0050_check_cluster_connectivity_create_sts_2.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0050_check_cluster_connectivity_create_sts_2.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0060_check_cluster_connectivity_wait_for_sts.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0060_check_cluster_connectivity_wait_for_sts.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0060_check_cluster_connectivity_wait_for_sts.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0060_check_cluster_connectivity_wait_for_sts.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0070_check_cluster_connectivity_create_pod_service_0.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0070_check_cluster_connectivity_create_pod_service_0.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0070_check_cluster_connectivity_create_pod_service_0.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0070_check_cluster_connectivity_create_pod_service_0.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0070_check_cluster_connectivity_create_pod_service_1.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0070_check_cluster_connectivity_create_pod_service_1.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0070_check_cluster_connectivity_create_pod_service_1.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0070_check_cluster_connectivity_create_pod_service_1.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0070_check_cluster_connectivity_create_pod_service_2.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0070_check_cluster_connectivity_create_pod_service_2.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0070_check_cluster_connectivity_create_pod_service_2.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0070_check_cluster_connectivity_create_pod_service_2.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0080_check_cluster_connectivity_create_round_robin_service_0.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0080_check_cluster_connectivity_create_round_robin_service_0.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0080_check_cluster_connectivity_create_round_robin_service_0.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0080_check_cluster_connectivity_create_round_robin_service_0.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0080_check_cluster_connectivity_create_round_robin_service_1.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0080_check_cluster_connectivity_create_round_robin_service_1.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0080_check_cluster_connectivity_create_round_robin_service_1.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0080_check_cluster_connectivity_create_round_robin_service_1.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0080_check_cluster_connectivity_create_round_robin_service_2.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0080_check_cluster_connectivity_create_round_robin_service_2.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0080_check_cluster_connectivity_create_round_robin_service_2.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0080_check_cluster_connectivity_create_round_robin_service_2.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.sh diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0100_check_cluster_connectivity_cleanup.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0100_check_cluster_connectivity_cleanup.sh similarity index 100% rename from public/architectures/setup-multi-cluster/verify-connectivity/code_snippets/0100_check_cluster_connectivity_cleanup.sh rename to public/architectures/setup-multi-cluster/ra-04-verify-connectivity/code_snippets/ra-04_0100_check_cluster_connectivity_cleanup.sh diff --git a/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/test.sh b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/test.sh new file mode 100755 index 000000000..f78d2073d --- /dev/null +++ b/public/architectures/setup-multi-cluster/ra-04-verify-connectivity/test.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-04_0045_create_connectivity_test_namespaces.sh + +run ra-04_0050_check_cluster_connectivity_create_sts_0.sh +run ra-04_0050_check_cluster_connectivity_create_sts_1.sh +run ra-04_0050_check_cluster_connectivity_create_sts_2.sh + +run ra-04_0060_check_cluster_connectivity_wait_for_sts.sh +run ra-04_0070_check_cluster_connectivity_create_pod_service_0.sh +run ra-04_0070_check_cluster_connectivity_create_pod_service_1.sh +run ra-04_0070_check_cluster_connectivity_create_pod_service_2.sh +run ra-04_0080_check_cluster_connectivity_create_round_robin_service_0.sh +run ra-04_0080_check_cluster_connectivity_create_round_robin_service_1.sh +run ra-04_0080_check_cluster_connectivity_create_round_robin_service_2.sh +run_for_output ra-04_0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.sh +run_for_output ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.sh +run_for_output ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.sh +run_for_output ra-04_0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.sh +run ra-04_0100_check_cluster_connectivity_cleanup.sh + +popd diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0215_helm_configure_repo.sh b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0215_helm_configure_repo.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0215_helm_configure_repo.sh rename to public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0215_helm_configure_repo.sh diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0216_helm_install_cert_manager.sh b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0216_helm_install_cert_manager.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0216_helm_install_cert_manager.sh rename to public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0216_helm_install_cert_manager.sh diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0220_create_issuer.sh b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0220_create_issuer.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0220_create_issuer.sh rename to public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0220_create_issuer.sh diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0221_verify_issuer.sh b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0221_verify_issuer.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0221_verify_issuer.sh rename to public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0221_verify_issuer.sh diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0225_create_ca_configmap.sh b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0225_create_ca_configmap.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/code_snippets/0225_create_ca_configmap.sh rename to public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/code_snippets/ra-05_0225_create_ca_configmap.sh diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/test.sh b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/test.sh similarity index 51% rename from public/architectures/setup-multi-cluster/setup-cert-manager/test.sh rename to public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/test.sh index 6019bab95..5913b4b40 100755 --- a/public/architectures/setup-multi-cluster/setup-cert-manager/test.sh +++ b/public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/test.sh @@ -11,10 +11,10 @@ pushd "${script_dir}" prepare_snippets -run_for_output 0215_helm_configure_repo.sh -run_for_output 0216_helm_install_cert_manager.sh -run 0220_create_issuer.sh -run_for_output 0221_verify_issuer.sh -run 0225_create_ca_configmap.sh +run_for_output ra-05_0215_helm_configure_repo.sh +run_for_output ra-05_0216_helm_install_cert_manager.sh +run ra-05_0220_create_issuer.sh +run_for_output ra-05_0221_verify_issuer.sh +run ra-05_0225_create_ca_configmap.sh popd diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0100_create_gke_sa.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0100_create_gke_sa.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0100_create_gke_sa.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0100_create_gke_sa.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0120_add_role_to_sa.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0120_add_role_to_sa.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0120_add_role_to_sa.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0120_add_role_to_sa.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0130_create_sa_key.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0130_create_sa_key.sh similarity index 62% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0130_create_sa_key.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0130_create_sa_key.sh index af41bc117..349bcb19e 100644 --- a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0130_create_sa_key.sh +++ b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0130_create_sa_key.sh @@ -1,3 +1,3 @@ mkdir -p secrets -gcloud iam service-accounts keys create secrets/external-dns-sa-key.json --iam-account="${DNS_SA_EMAIL}" +gcloud iam service-accounts keys create secrets/external-dns-sa-key.json --iam-account="${DNS_SA_EMAIL}" || true diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0140_create_namespaces.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0140_create_namespaces.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0140_create_namespaces.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0140_create_namespaces.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0150_create_sa_secrets.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0150_create_sa_secrets.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0150_create_sa_secrets.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0150_create_sa_secrets.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0200_install_externaldns.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0200_install_externaldns.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0200_install_externaldns.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0200_install_externaldns.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0300_setup_dns_zone.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0300_setup_dns_zone.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/0300_setup_dns_zone.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_0300_setup_dns_zone.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/9000_delete_sa.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_9000_delete_sa.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/9000_delete_sa.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_9000_delete_sa.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/9050_delete_namespace.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_9050_delete_namespace.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/9050_delete_namespace.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_9050_delete_namespace.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/9100_delete_dns_zone.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_9100_delete_dns_zone.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/code_snippets/9100_delete_dns_zone.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/code_snippets/ra-09_9100_delete_dns_zone.sh diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/env_variables.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/env_variables.sh similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/env_variables.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/env_variables.sh diff --git a/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/teardown.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/teardown.sh new file mode 100755 index 000000000..f7223dac3 --- /dev/null +++ b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/teardown.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -eou pipefail + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +script_dir=$(dirname "${script_name}") + +source scripts/code_snippets/sample_test_runner.sh + +pushd "${script_dir}" + +prepare_snippets + +run ra-09_9000_delete_sa.sh +run ra-09_9050_delete_namespace.sh +run ra-09_9100_delete_dns_zone.sh + +popd diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/test.sh b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/test.sh similarity index 54% rename from public/architectures/setup-multi-cluster/setup-externaldns/test.sh rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/test.sh index be99a98ac..972409af3 100755 --- a/public/architectures/setup-multi-cluster/setup-externaldns/test.sh +++ b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/test.sh @@ -11,14 +11,14 @@ pushd "${script_dir}" prepare_snippets -run 0100_create_gke_sa.sh +run ra-09_0100_create_gke_sa.sh # need to wait as the SA is not immediately available sleep 10 -run 0120_add_role_to_sa.sh -run 0130_create_sa_key.sh -run 0140_create_namespaces.sh -run 0150_create_sa_secrets.sh -run 0200_install_externaldns.sh -run 0300_setup_dns_zone.sh +run ra-09_0120_add_role_to_sa.sh +run ra-09_0130_create_sa_key.sh +run ra-09_0140_create_namespaces.sh +run ra-09_0150_create_sa_secrets.sh +run ra-09_0200_install_externaldns.sh +run ra-09_0300_setup_dns_zone.sh popd diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/yamls/externaldns.yaml b/public/architectures/setup-multi-cluster/ra-09-setup-externaldns/yamls/externaldns.yaml similarity index 100% rename from public/architectures/setup-multi-cluster/setup-externaldns/yamls/externaldns.yaml rename to public/architectures/setup-multi-cluster/ra-09-setup-externaldns/yamls/externaldns.yaml diff --git a/public/architectures/setup-multi-cluster/setup-externaldns/teardown.sh b/public/architectures/setup-multi-cluster/setup-externaldns/teardown.sh deleted file mode 100755 index f6fb4ad2e..000000000 --- a/public/architectures/setup-multi-cluster/setup-externaldns/teardown.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 9000_delete_sa.sh -run 9050_delete_namespace.sh -run 9100_delete_dns_zone.sh - -popd diff --git a/public/architectures/setup-multi-cluster/setup-gke/output/0030_verify_access_to_clusters.out b/public/architectures/setup-multi-cluster/setup-gke/output/0030_verify_access_to_clusters.out deleted file mode 100644 index 814af3902..000000000 --- a/public/architectures/setup-multi-cluster/setup-gke/output/0030_verify_access_to_clusters.out +++ /dev/null @@ -1,15 +0,0 @@ -Nodes in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 -NAME STATUS ROLES AGE VERSION -gke-k8s-mdb-0-686cc1e099-default-pool-63c33f99-532x Ready 3m7s v1.32.4-gke.1415000 -gke-k8s-mdb-0-686cc1e099-default-pool-63c33f99-fs12 Ready 3m7s v1.32.4-gke.1415000 -gke-k8s-mdb-0-686cc1e099-default-pool-63c33f99-hghj Ready 3m7s v1.32.4-gke.1415000 - -Nodes in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-686cc1e099f9ef000722c191-862 -NAME STATUS ROLES AGE VERSION -gke-k8s-mdb-1-686cc1e099-default-pool-93d5418d-712x Ready 57s v1.32.4-gke.1415000 -gke-k8s-mdb-1-686cc1e099-default-pool-93d5418d-hpcc Ready 58s v1.32.4-gke.1415000 -gke-k8s-mdb-1-686cc1e099-default-pool-93d5418d-wg14 Ready 61s v1.32.4-gke.1415000 - -Nodes in cluster gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-686cc1e099f9ef000722c191-862 -NAME STATUS ROLES AGE VERSION -gke-k8s-mdb-2-686cc1e099-default-pool-d128293d-tng2 Ready 3m12s v1.32.4-gke.1415000 diff --git a/public/architectures/setup-multi-cluster/setup-gke/teardown.sh b/public/architectures/setup-multi-cluster/setup-gke/teardown.sh deleted file mode 100755 index 155327fc8..000000000 --- a/public/architectures/setup-multi-cluster/setup-gke/teardown.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 9010_delete_gke_clusters.sh - -popd diff --git a/public/architectures/setup-multi-cluster/setup-gke/test.sh b/public/architectures/setup-multi-cluster/setup-gke/test.sh deleted file mode 100755 index 040e2092a..000000000 --- a/public/architectures/setup-multi-cluster/setup-gke/test.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 0005_gcloud_set_current_project.sh -run 0010_create_gke_cluster_0.sh & -run 0010_create_gke_cluster_1.sh & -run 0010_create_gke_cluster_2.sh & -wait - -run 0020_get_gke_credentials.sh -run_for_output 0030_verify_access_to_clusters.sh - -popd diff --git a/public/architectures/setup-multi-cluster/setup-operator/teardown.sh b/public/architectures/setup-multi-cluster/setup-operator/teardown.sh deleted file mode 100755 index faef13d92..000000000 --- a/public/architectures/setup-multi-cluster/setup-operator/teardown.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 9000_delete_namespaces.sh - -popd diff --git a/public/architectures/setup-multi-cluster/setup-operator/test.sh b/public/architectures/setup-multi-cluster/setup-operator/test.sh deleted file mode 100755 index 12cbd5f47..000000000 --- a/public/architectures/setup-multi-cluster/setup-operator/test.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 0045_create_namespaces.sh -run 0046_create_image_pull_secrets.sh - -run_for_output 0200_kubectl_mongodb_configure_multi_cluster.sh -run_for_output 0205_helm_configure_repo.sh -run_for_output 0210_helm_install_operator.sh -run_for_output 0211_check_operator_deployment.sh - -popd diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/test.sh b/public/architectures/setup-multi-cluster/verify-connectivity/test.sh deleted file mode 100755 index 543ffab2e..000000000 --- a/public/architectures/setup-multi-cluster/verify-connectivity/test.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source scripts/code_snippets/sample_test_runner.sh - -pushd "${script_dir}" - -prepare_snippets - -run 0045_create_connectivity_test_namespaces.sh - -run 0050_check_cluster_connectivity_create_sts_0.sh -run 0050_check_cluster_connectivity_create_sts_1.sh -run 0050_check_cluster_connectivity_create_sts_2.sh - -run 0060_check_cluster_connectivity_wait_for_sts.sh -run 0070_check_cluster_connectivity_create_pod_service_0.sh -run 0070_check_cluster_connectivity_create_pod_service_1.sh -run 0070_check_cluster_connectivity_create_pod_service_2.sh -run 0080_check_cluster_connectivity_create_round_robin_service_0.sh -run 0080_check_cluster_connectivity_create_round_robin_service_1.sh -run 0080_check_cluster_connectivity_create_round_robin_service_2.sh -run_for_output 0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.sh -run_for_output 0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.sh -run_for_output 0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.sh -run_for_output 0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.sh -run 0100_check_cluster_connectivity_cleanup.sh - -popd diff --git a/scripts/code_snippets/code_snippets_cleanup.sh b/scripts/code_snippets/code_snippets_cleanup.sh index 5c4736bb4..f88f9f36a 100755 --- a/scripts/code_snippets/code_snippets_cleanup.sh +++ b/scripts/code_snippets/code_snippets_cleanup.sh @@ -1,16 +1,36 @@ -#!/usr/bin/env bash +#!/bin/bash set -eou pipefail -find public/architectures -name "test.sh" -exec sh -c ' - source scripts/code_snippets/sample_test_runner.sh +script_name=$(readlink -f "${BASH_SOURCE[0]}") +# shellcheck disable=SC2034 +script_dir=$(dirname "${script_name}") - pushd "$(dirname $1)" +source scripts/code_snippets/sample_test_runner.sh + +cleanup_directory() { + local test_file="$1" + local dir + dir="$(dirname "${test_file}")" + + echo " ${dir}" + + pushd "${dir}" >/dev/null run_cleanup "test.sh" run_cleanup "teardown.sh" - rm -rf istio* - rm -rf certs - rm -rf secrets + rm -rf .generated 2>/dev/null || true + rm -rf istio* 2>/dev/null || true + rm -rf certs 2>/dev/null || true + rm -rf secrets 2>/dev/null || true + rm ./*.run.log 2>/dev/null || true + popd >/dev/null +} + +echo "Cleaning up from snippets runtime files from the following directories..." +for snippet_dir in $(bash "${script_dir}/find_snippets_directories.sh"); do + cleanup_directory "${snippet_dir}/test.sh" & +done + +wait +echo "Cleaning up done." - popd - ' sh {} \; diff --git a/scripts/code_snippets/find_snippets_directories.sh b/scripts/code_snippets/find_snippets_directories.sh new file mode 100644 index 000000000..463a42ea5 --- /dev/null +++ b/scripts/code_snippets/find_snippets_directories.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -eou pipefail +test "${MDB_BASH_DEBUG:-0}" -eq 1 && set -x + +source scripts/dev/set_env_context.sh + +# It finds all directories containing both test.sh and code_snippets subdirectory +find . -path "*/code_snippets" -type d | while read -r code_snippets_dir; do + parent_dir="$(dirname "${code_snippets_dir}")" + if [[ -f "${parent_dir}/test.sh" ]]; then + echo "${parent_dir}" + fi +done diff --git a/scripts/code_snippets/kind_community_search_snippets_render_template.sh b/scripts/code_snippets/kind_community_search_snippets_render_template.sh index f7c86d1f7..2aa68dcaa 100755 --- a/scripts/code_snippets/kind_community_search_snippets_render_template.sh +++ b/scripts/code_snippets/kind_community_search_snippets_render_template.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -eou pipefail -source scripts/dev/set_env_context.sh -test_dir="docs/community-search/quick-start" -python scripts/code_snippets/render_template.py "${test_dir}/README.md.j2" "${test_dir}/README.md" +test_dir="$1" +scripts/dev/run_python.sh scripts/code_snippets/render_template.py "${test_dir}/README.md.j2" "${test_dir}/README.md" diff --git a/scripts/code_snippets/sample_commit_output.sh b/scripts/code_snippets/sample_commit_output.sh index 0eb12227b..12790b0b5 100755 --- a/scripts/code_snippets/sample_commit_output.sh +++ b/scripts/code_snippets/sample_commit_output.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash -set -Eeou pipefail +set -eou pipefail +test "${MDB_BASH_DEBUG:-0}" -eq 1 && set -x + source scripts/dev/set_env_context.sh if [[ "${CODE_SNIPPETS_COMMIT_OUTPUT:-"false"}" == "true" ]]; then @@ -8,9 +10,7 @@ if [[ "${CODE_SNIPPETS_COMMIT_OUTPUT:-"false"}" == "true" ]]; then branch="meko-snippets-update-$(date "+%Y%m%d%H%M%S")" git checkout -b "${branch}" git reset - git add public/architectures/**/*.out - git add docs/**/output/*.out - git add docs/**/*.md + git add scripts/code_snippets/tests/outputs/test_* git commit -m "Update code snippets outputs" git remote set-url origin "https://x-access-token:${GH_TOKEN}@github.com/mongodb/mongodb-kubernetes.git" git push origin "${branch}" diff --git a/scripts/code_snippets/sample_test_runner.sh b/scripts/code_snippets/sample_test_runner.sh index bc579b732..0e9c17f0b 100755 --- a/scripts/code_snippets/sample_test_runner.sh +++ b/scripts/code_snippets/sample_test_runner.sh @@ -2,12 +2,22 @@ set -eou pipefail -log_file="$(basename "$0").run.log" +test "${MDB_BASH_DEBUG:-0}" -eq 1 && set -x + +script_name=$(readlink -f "${BASH_SOURCE[0]}") +# we reuse script_dir if already set by the script that is sourcing this file +script_dir=${script_dir:-$(dirname "${script_name}")} + +# script_dir will be set from the file that is sourcing this file +log_file="${RUN_LOG_FILE:-$(basename "${script_dir}").run.log}" + snippets_src_dir="code_snippets" snippets_run_dir=".generated" DEBUG=${DEBUG:-"false"} +_SNIPPETS_OUTPUT_DIR=${_SNIPPETS_OUTPUT_DIR:-"output"} + function snippets_list() { src_dir=$1 # shellcheck disable=SC2012 @@ -18,7 +28,8 @@ function run_cleanup() { script_file=$1 rm -rf "${snippets_run_dir}" 2>/dev/null || true rm -rf "log" 2>/dev/null || true - git restore --staged --worktree rm -rf "output" 2>/dev/null || true + rm -rf ".generated" 2>/dev/null || true + git restore --staged --worktree rm -rf "${_SNIPPETS_OUTPUT_DIR}" 2>/dev/null || true rm -rf "${script_file}.run.log" 2>/dev/null || true } @@ -27,7 +38,7 @@ function prepare_snippets() { touch "${log_file}" mkdir log 2>/dev/null || true - mkdir output 2>/dev/null || true + mkdir "${_SNIPPETS_OUTPUT_DIR}" 2>/dev/null || true rm -rf "${snippets_run_dir}" 2>/dev/null || true mkdir "${snippets_run_dir}" 2>/dev/null || true @@ -36,7 +47,7 @@ function prepare_snippets() { while IFS= read -r file_name; do file_path="${snippets_run_dir}/${file_name}" ( - echo "# This file is generated automatically from ${file_path}" + echo "# This file is generated automatically from ${snippets_src_dir}/${file_name}" echo "# DO NOT EDIT" echo "function ${file_name%.sh}() {" cat "${snippets_src_dir}/${file_name}" @@ -95,7 +106,7 @@ function run_for_output() { ret=$? set -e if [[ ${ret} == 0 ]]; then - tee "output/${cmd}.out" < "${stdout_file}" + tee "${_SNIPPETS_OUTPUT_DIR}/${cmd}.out" < "${stdout_file}" else echo "Error running: ${cmd}" fi diff --git a/scripts/code_snippets/task_gke_multi_cluster_no_mesh_snippets_test.sh b/scripts/code_snippets/task_gke_multi_cluster_no_mesh_snippets_test.sh deleted file mode 100755 index 97245a8c2..000000000 --- a/scripts/code_snippets/task_gke_multi_cluster_no_mesh_snippets_test.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail -source scripts/dev/set_env_context.sh - -function cleanup() { - if [ "${code_snippets_teardown:-true}" = true ]; then - echo "Deleting clusters and resources" - ./public/architectures/ops-manager-mc-no-mesh/teardown.sh & - ./public/architectures/setup-multi-cluster/setup-externaldns/teardown.sh & - wait - - ./public/architectures/setup-multi-cluster/setup-gke/teardown.sh - elif [ "${code_snippets_reset:-false}" = true ]; then - echo "Deleting resources, keeping the clusters" - ./public/architectures/ops-manager-mc-no-mesh/teardown.sh & - ./public/architectures/mongodb-sharded-mc-no-mesh/teardown.sh & - ./public/architectures/mongodb-replicaset-mc-no-mesh/teardown.sh & - ./public/architectures/setup-multi-cluster/setup-externaldns/teardown.sh & - wait - - ./public/architectures/setup-multi-cluster/setup-operator/teardown.sh - else - echo "Not deleting anything" - fi -} -trap cleanup EXIT - -source public/architectures/setup-multi-cluster/setup-gke/env_variables.sh -./public/architectures/setup-multi-cluster/setup-gke/test.sh - -source public/architectures/setup-multi-cluster/setup-operator/env_variables.sh -./public/architectures/setup-multi-cluster/setup-operator/test.sh - -./public/architectures/setup-multi-cluster/setup-cert-manager/test.sh - -source public/architectures/setup-multi-cluster/setup-externaldns/env_variables.sh -./public/architectures/setup-multi-cluster/setup-externaldns/test.sh - -source public/architectures/ops-manager-mc-no-mesh/env_variables.sh -./public/architectures/ops-manager-mc-no-mesh/test.sh - -source public/architectures/mongodb-replicaset-mc-no-mesh/env_variables.sh -./public/architectures/mongodb-replicaset-mc-no-mesh/test.sh - -source public/architectures/mongodb-sharded-mc-no-mesh/env_variables.sh -./public/architectures/mongodb-sharded-mc-no-mesh/test.sh diff --git a/scripts/code_snippets/task_gke_multi_cluster_snippets_test.sh b/scripts/code_snippets/task_gke_multi_cluster_snippets_test.sh deleted file mode 100755 index 850a68e9c..000000000 --- a/scripts/code_snippets/task_gke_multi_cluster_snippets_test.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail -source scripts/dev/set_env_context.sh - -function cleanup() { - if [ "${code_snippets_teardown:-true}" = true ]; then - echo "Deleting clusters" - ./public/architectures/setup-multi-cluster/setup-gke/teardown.sh - elif [ "${code_snippets_reset:-false}" = true ]; then - echo "Deleting resources, keeping the clusters" - ./public/architectures/ops-manager-multi-cluster/teardown.sh & - ./public/architectures/mongodb-sharded-multi-cluster/teardown.sh & - ./public/architectures/mongodb-replicaset-multi-cluster/teardown.sh & - wait - - ./public/architectures/setup-multi-cluster/setup-operator/teardown.sh - else - echo "Not deleting anything" - fi -} -trap cleanup EXIT - -source public/architectures/setup-multi-cluster/setup-gke/env_variables.sh -./public/architectures/setup-multi-cluster/setup-gke/test.sh - -source public/architectures/setup-multi-cluster/setup-operator/env_variables.sh -./public/architectures/setup-multi-cluster/setup-operator/test.sh - -./public/architectures/setup-multi-cluster/setup-istio/test.sh - -./public/architectures/setup-multi-cluster/verify-connectivity/test.sh - -./public/architectures/setup-multi-cluster/setup-cert-manager/test.sh - -source public/architectures/ops-manager-multi-cluster/env_variables.sh -./public/architectures/ops-manager-multi-cluster/test.sh - -source public/architectures/mongodb-replicaset-multi-cluster/env_variables.sh -./public/architectures/mongodb-replicaset-multi-cluster/test.sh - -source public/architectures/mongodb-sharded-multi-cluster/env_variables.sh -./public/architectures/mongodb-sharded-multi-cluster/test.sh diff --git a/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-01_0030_verify_access_to_clusters.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-01_0030_verify_access_to_clusters.out new file mode 100644 index 000000000..156ad4795 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-01_0030_verify_access_to_clusters.out @@ -0,0 +1,15 @@ +Nodes in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 +NAME STATUS ROLES AGE VERSION +gke-k8s-mdb-0-68876175f5-default-pool-c1ce34c2-4bg5 Ready 7m20s v1.33.2-gke.1240000 +gke-k8s-mdb-0-68876175f5-default-pool-c1ce34c2-bk96 Ready 7m22s v1.33.2-gke.1240000 +gke-k8s-mdb-0-68876175f5-default-pool-c1ce34c2-r0px Ready 7m21s v1.33.2-gke.1240000 + +Nodes in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 +NAME STATUS ROLES AGE VERSION +gke-k8s-mdb-1-68876175f5-default-pool-6f4972b3-bxwx Ready 6m30s v1.33.2-gke.1240000 +gke-k8s-mdb-1-68876175f5-default-pool-6f4972b3-djkk Ready 6m30s v1.33.2-gke.1240000 +gke-k8s-mdb-1-68876175f5-default-pool-6f4972b3-ps8q Ready 6m30s v1.33.2-gke.1240000 + +Nodes in cluster gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-68876175f5ad6d0007fdc1d4-31160 +NAME STATUS ROLES AGE VERSION +gke-k8s-mdb-2-68876175f5-default-pool-e4665169-g134 Ready 7m16s v1.33.2-gke.1240000 diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0200_kubectl_mongodb_configure_multi_cluster.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0200_kubectl_mongodb_configure_multi_cluster.out similarity index 83% rename from public/architectures/setup-multi-cluster/setup-operator/output/0200_kubectl_mongodb_configure_multi_cluster.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0200_kubectl_mongodb_configure_multi_cluster.out index c04777b8d..6a82b75ec 100644 --- a/public/architectures/setup-multi-cluster/setup-operator/output/0200_kubectl_mongodb_configure_multi_cluster.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0200_kubectl_mongodb_configure_multi_cluster.out @@ -1,49 +1,49 @@ -Build: , +Build: 1bcc69172341bbdb7eed4366df26dd960f53119e, 2025-08-24T21:36:12Z Ensured namespaces exist in all clusters. -creating central cluster roles in cluster: gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 +creating central cluster roles in cluster: gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrolebinding: mongodb-kubernetes-operator-mongodb-operator-multi-cluster-mongodb-role-binding created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrolebinding: mongodb-kubernetes-operator-mongodb-operator-multi-cluster-mongodb-role-binding -creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-686cc1e099f9ef000722c191-862 +creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding -creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-686cc1e099f9ef000722c191-862 +creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-68876175f5ad6d0007fdc1d4-31160 created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding Ensured ServiceAccounts and Roles. -Creating KubeConfig secret mongodb-operator/mongodb-enterprise-operator-multi-cluster-kubeconfig in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 +Creating KubeConfig secret mongodb-operator/mongodb-enterprise-operator-multi-cluster-kubeconfig in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 Ensured database Roles in member clusters. -Creating Member list Configmap mongodb-operator/mongodb-kubernetes-operator-member-list in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 +Creating Member list Configmap mongodb-operator/mongodb-kubernetes-operator-member-list in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 -Build: , +Build: 1bcc69172341bbdb7eed4366df26dd960f53119e, 2025-08-24T21:36:12Z Ensured namespaces exist in all clusters. -creating central cluster roles in cluster: gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 +creating central cluster roles in cluster: gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrolebinding: mongodb-kubernetes-operator-mongodb-operator-multi-cluster-mongodb-role-binding created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrolebinding: mongodb-kubernetes-operator-mongodb-operator-multi-cluster-mongodb-role-binding -creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-686cc1e099f9ef000722c191-862 +creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding -creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-686cc1e099f9ef000722c191-862 +creating member roles in cluster: gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-68876175f5ad6d0007fdc1d4-31160 created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding created clusterrole: mongodb-kubernetes-operator-multi-cluster-role-telemetry created clusterrolebinding: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding Ensured ServiceAccounts and Roles. -Creating KubeConfig secret mongodb-operator/mongodb-enterprise-operator-multi-cluster-kubeconfig in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 +Creating KubeConfig secret mongodb-operator/mongodb-enterprise-operator-multi-cluster-kubeconfig in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 Secret mongodb-operator/mongodb-enterprise-operator-multi-cluster-kubeconfig already exists, updating it Ensured database Roles in member clusters. -Creating Member list Configmap mongodb-operator/mongodb-kubernetes-operator-member-list in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-686cc1e099f9ef000722c191-862 +Creating Member list Configmap mongodb-operator/mongodb-kubernetes-operator-member-list in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0205_helm_configure_repo.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0205_helm_configure_repo.out similarity index 85% rename from public/architectures/setup-multi-cluster/setup-operator/output/0205_helm_configure_repo.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0205_helm_configure_repo.out index e8630fdff..b1576c236 100644 --- a/public/architectures/setup-multi-cluster/setup-operator/output/0205_helm_configure_repo.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0205_helm_configure_repo.out @@ -1,4 +1,4 @@ -"mongodb" has been added to your repositories +"mongodb" already exists with the same configuration, skipping Hang tight while we grab the latest from your chart repositories... ...Successfully got an update from the "mongodb" chart repository Update Complete. ⎈Happy Helming!⎈ diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0210_helm_install_operator.out similarity index 98% rename from public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0210_helm_install_operator.out index 7627b0a11..122637fd0 100644 --- a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0210_helm_install_operator.out @@ -23,7 +23,7 @@ operator: COMPUTED VALUES: agent: - name: mongodb-agent + name: mongodb-agent-ubi version: 108.0.2.8729-1 community: agent: @@ -331,9 +331,9 @@ spec: - name: OPS_MANAGER_IMAGE_PULL_POLICY value: Always - name: AGENT_IMAGE - value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1" + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" - name: MDB_AGENT_IMAGE_REPOSITORY - value: "quay.io/mongodb/mongodb-agent" + value: "quay.io/mongodb/mongodb-agent-ubi" - name: MONGODB_IMAGE value: mongodb-enterprise-server - name: MONGODB_REPO_URL diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0211_check_operator_deployment.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0211_check_operator_deployment.out similarity index 85% rename from public/architectures/setup-multi-cluster/setup-operator/output/0211_check_operator_deployment.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0211_check_operator_deployment.out index 12cff4d42..2f01f86c7 100644 --- a/public/architectures/setup-multi-cluster/setup-operator/output/0211_check_operator_deployment.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-02_0211_check_operator_deployment.out @@ -6,4 +6,4 @@ mongodb-kubernetes-operator-multi-cluster 1/1 1 1 8s Operator pod in mongodb-operator namespace NAME READY STATUS RESTARTS AGE -mongodb-kubernetes-operator-multi-cluster-5b875c54c5-d2gq6 1/1 Running 0 8s +mongodb-kubernetes-operator-multi-cluster-64647b6db5-2jfn5 1/1 Running 0 9s diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.out similarity index 71% rename from public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.out index a4bba85c3..4665128e6 100644 --- a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_0_0_from_cluster_1.out @@ -1,2 +1,2 @@ -Checking cross-cluster DNS resolution and connectivity from echoserver1-0 in gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-682f2df6e1745e000788a1d5-24552 to echoserver0-0 +Checking cross-cluster DNS resolution and connectivity from echoserver1-0 in gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 to echoserver0-0 SUCCESS diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.out similarity index 71% rename from public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.out index 2272553f9..0e6fcac94 100644 --- a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_0.out @@ -1,2 +1,2 @@ -Checking cross-cluster DNS resolution and connectivity from echoserver0-0 in gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-682f2df6e1745e000788a1d5-24552 to echoserver1-0 +Checking cross-cluster DNS resolution and connectivity from echoserver0-0 in gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 to echoserver1-0 SUCCESS diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.out similarity index 71% rename from public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.out index 174dfd35d..7b79ecdd0 100644 --- a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_1_0_from_cluster_2.out @@ -1,2 +1,2 @@ -Checking cross-cluster DNS resolution and connectivity from echoserver2-0 in gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-682f2df6e1745e000788a1d5-24552 to echoserver1-0 +Checking cross-cluster DNS resolution and connectivity from echoserver2-0 in gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-68876175f5ad6d0007fdc1d4-31160 to echoserver1-0 SUCCESS diff --git a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.out similarity index 71% rename from public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.out index 7c5f21ec9..78286fa61 100644 --- a/public/architectures/setup-multi-cluster/verify-connectivity/output/0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-04_0090_check_cluster_connectivity_verify_pod_2_0_from_cluster_0.out @@ -1,2 +1,2 @@ -Checking cross-cluster DNS resolution and connectivity from echoserver0-0 in gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-682f2df6e1745e000788a1d5-24552 to echoserver2-0 +Checking cross-cluster DNS resolution and connectivity from echoserver0-0 in gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 to echoserver2-0 SUCCESS diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/output/0215_helm_configure_repo.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0215_helm_configure_repo.out similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/output/0215_helm_configure_repo.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0215_helm_configure_repo.out diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/output/0216_helm_install_cert_manager.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0216_helm_install_cert_manager.out similarity index 96% rename from public/architectures/setup-multi-cluster/setup-cert-manager/output/0216_helm_install_cert_manager.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0216_helm_install_cert_manager.out index e00ae2241..b6242935f 100644 --- a/public/architectures/setup-multi-cluster/setup-cert-manager/output/0216_helm_install_cert_manager.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0216_helm_install_cert_manager.out @@ -1,6 +1,6 @@ Release "cert-manager" does not exist. Installing it now. NAME: cert-manager -LAST DEPLOYED: Tue Jul 8 07:13:38 2025 +LAST DEPLOYED: Mon Aug 25 09:08:18 2025 NAMESPACE: cert-manager STATUS: deployed REVISION: 1 diff --git a/public/architectures/setup-multi-cluster/setup-cert-manager/output/0221_verify_issuer.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0221_verify_issuer.out similarity index 100% rename from public/architectures/setup-multi-cluster/setup-cert-manager/output/0221_verify_issuer.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-05_0221_verify_issuer.out diff --git a/public/architectures/ops-manager-multi-cluster/output/0311_ops_manager_wait_for_pending_state.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0311_ops_manager_wait_for_pending_state.out similarity index 100% rename from public/architectures/ops-manager-multi-cluster/output/0311_ops_manager_wait_for_pending_state.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0311_ops_manager_wait_for_pending_state.out diff --git a/public/architectures/ops-manager-multi-cluster/output/0312_ops_manager_wait_for_running_state.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0312_ops_manager_wait_for_running_state.out similarity index 65% rename from public/architectures/ops-manager-multi-cluster/output/0312_ops_manager_wait_for_running_state.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0312_ops_manager_wait_for_running_state.out index 45a23aefb..7ece648e9 100644 --- a/public/architectures/ops-manager-multi-cluster/output/0312_ops_manager_wait_for_running_state.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0312_ops_manager_wait_for_running_state.out @@ -6,13 +6,13 @@ mongodbopsmanager.mongodb.com/om condition met MongoDBOpsManager resource NAME REPLICAS VERSION STATE (OPSMANAGER) STATE (APPDB) STATE (BACKUP) AGE WARNINGS -om 8.0.5 Running Running Disabled 12m +om 8.0.5 Running Running Disabled 18m -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 NAME READY STATUS RESTARTS AGE -om-0-0 2/2 Running 0 9m41s -om-db-0-0 4/4 Running 0 51s -om-db-0-1 4/4 Running 0 2m25s -om-db-0-2 4/4 Running 0 4m16s +om-0-0 2/2 Running 0 15m +om-db-0-0 4/4 Running 0 7m31s +om-db-0-1 4/4 Running 0 9m2s +om-db-0-2 4/4 Running 0 10m -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 diff --git a/public/architectures/ops-manager-mc-no-mesh/output/0321_ops_manager_wait_for_pending_state.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0321_ops_manager_wait_for_pending_state.out similarity index 100% rename from public/architectures/ops-manager-mc-no-mesh/output/0321_ops_manager_wait_for_pending_state.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0321_ops_manager_wait_for_pending_state.out diff --git a/public/architectures/ops-manager-multi-cluster/output/0322_ops_manager_wait_for_running_state.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0322_ops_manager_wait_for_running_state.out similarity index 62% rename from public/architectures/ops-manager-multi-cluster/output/0322_ops_manager_wait_for_running_state.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0322_ops_manager_wait_for_running_state.out index 2b45590a2..fc67f254a 100644 --- a/public/architectures/ops-manager-multi-cluster/output/0322_ops_manager_wait_for_running_state.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0322_ops_manager_wait_for_running_state.out @@ -6,17 +6,17 @@ mongodbopsmanager.mongodb.com/om condition met MongoDBOpsManager resource NAME REPLICAS VERSION STATE (OPSMANAGER) STATE (APPDB) STATE (BACKUP) AGE WARNINGS -om 8.0.5 Running Running Disabled 20m +om 8.0.5 Running Running Disabled 26m -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 NAME READY STATUS RESTARTS AGE om-0-0 2/2 Running 0 2m53s -om-db-0-0 4/4 Running 0 8m42s -om-db-0-1 4/4 Running 0 10m -om-db-0-2 4/4 Running 0 12m +om-db-0-0 4/4 Running 0 14m +om-db-0-1 4/4 Running 0 16m +om-db-0-2 4/4 Running 0 17m -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 NAME READY STATUS RESTARTS AGE -om-1-0 2/2 Running 0 3m24s -om-db-1-0 4/4 Running 0 7m43s -om-db-1-1 4/4 Running 0 5m31s +om-1-0 2/2 Running 0 3m25s +om-db-1-0 4/4 Running 0 7m16s +om-db-1-1 4/4 Running 0 5m2s diff --git a/public/architectures/ops-manager-multi-cluster/output/0522_ops_manager_wait_for_running_state.out b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0522_ops_manager_wait_for_running_state.out similarity index 63% rename from public/architectures/ops-manager-multi-cluster/output/0522_ops_manager_wait_for_running_state.out rename to scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0522_ops_manager_wait_for_running_state.out index 9f404efdc..c3a0d3b14 100644 --- a/public/architectures/ops-manager-multi-cluster/output/0522_ops_manager_wait_for_running_state.out +++ b/scripts/code_snippets/tests/outputs/test_gke_multi_cluster_snippets/ra-06_0522_ops_manager_wait_for_running_state.out @@ -9,21 +9,21 @@ mongodbopsmanager.mongodb.com/om condition met MongoDBOpsManager resource NAME REPLICAS VERSION STATE (OPSMANAGER) STATE (APPDB) STATE (BACKUP) AGE WARNINGS -om 8.0.5 Running Running Running 23m +om 8.0.5 Running Running Running 29m -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0-68876175f5ad6d0007fdc1d4-31160 NAME READY STATUS RESTARTS AGE -om-0-0 2/2 Running 0 5m46s -om-db-0-0 4/4 Running 0 11m -om-db-0-1 4/4 Running 0 13m -om-db-0-2 4/4 Running 0 15m +om-0-0 2/2 Running 0 6m2s +om-db-0-0 4/4 Running 0 18m +om-db-0-1 4/4 Running 0 19m +om-db-0-2 4/4 Running 0 20m -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1-68876175f5ad6d0007fdc1d4-31160 NAME READY STATUS RESTARTS AGE -om-1-0 2/2 Running 0 6m17s +om-1-0 2/2 Running 0 6m33s om-db-1-0 4/4 Running 0 10m -om-db-1-1 4/4 Running 0 8m24s +om-db-1-1 4/4 Running 0 8m10s -Pods running in cluster gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-682f2df6e1745e000788a1d5-24552 +Pods running in cluster gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2-68876175f5ad6d0007fdc1d4-31160 NAME READY STATUS RESTARTS AGE -om-2-backup-daemon-0 2/2 Running 0 2m31s +om-2-backup-daemon-0 2/2 Running 0 2m49s diff --git a/docs/community-search/quick-start/output/090_helm_add_mogodb_repo.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0090_helm_add_mogodb_repo.out similarity index 100% rename from docs/community-search/quick-start/output/090_helm_add_mogodb_repo.out rename to scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0090_helm_add_mogodb_repo.out diff --git a/docs/community-search/quick-start/output/0100_install_operator.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0100_install_operator.out similarity index 89% rename from docs/community-search/quick-start/output/0100_install_operator.out rename to scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0100_install_operator.out index c54b9c92e..47e539800 100644 --- a/docs/community-search/quick-start/output/0100_install_operator.out +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0100_install_operator.out @@ -6,8 +6,48 @@ STATUS: deployed REVISION: 1 TEST SUITE: None USER-SUPPLIED VALUES: -dummy: value - +agent: + version: 108.0.2.8729-1 +database: + name: mongodb-kubernetes-database + version: 68876175f5ad6d0007fdc1d4 +initAppDb: + version: 68876175f5ad6d0007fdc1d4 +initDatabase: + version: 68876175f5ad6d0007fdc1d4 +initOpsManager: + version: 68876175f5ad6d0007fdc1d4 +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: 68876175f5ad6d0007fdc1d4 +opsManager: + name: mongodb-enterprise-ops-manager-ubi +registry: + agent: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev + appDb: quay.io/mongodb + database: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev + imagePullSecrets: image-registries-secret + initAppDb: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev + initDatabase: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev + initOpsManager: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev + operator: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev + opsManager: quay.io/mongodb +search: + community: + name: mongot/community + repo: 268558157000.dkr.ecr.eu-west-1.amazonaws.com + version: fbd60fb055dd500058edcb45677ea85d19421f47 COMPUTED VALUES: agent: name: mongodb-agent @@ -53,7 +93,7 @@ initOpsManager: managedSecurityContext: false mongodb: appdbAssumeOldFormat: false - imageType: ubi8 + imageType: ubi9 name: mongodb-enterprise-server repo: quay.io/mongodb multiCluster: @@ -71,7 +111,7 @@ operator: enableClusterMongoDBRoles: true enablePVCResize: true env: prod - maxConcurrentReconciles: 1 + maxConcurrentReconciles: 10 mdbDefaultArchitecture: non-static name: mongodb-kubernetes-operator nodeSelector: {} @@ -88,9 +128,10 @@ operator: collection: clusters: {} deployments: {} - frequency: 1h + frequency: 1m operators: {} send: + enabled: false frequency: 168h tolerations: [] vaultSecretBackend: @@ -129,7 +170,6 @@ search: name: mongodb-search-community repo: quay.io/mongodb version: 1.47.0 -subresourceEnabled: true versionUpgradeHook: name: mongodb-kubernetes-operator-version-upgrade-post-start-hook version: 1.0.9 @@ -479,7 +519,9 @@ spec: fieldRef: fieldPath: metadata.namespace - name: MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY - value: "1h" + value: "1m" + - name: MDB_OPERATOR_TELEMETRY_SEND_ENABLED + value: "false" - name: MDB_OPERATOR_TELEMETRY_SEND_FREQUENCY value: "168h" - name: CLUSTER_CLIENT_TIMEOUT @@ -518,11 +560,11 @@ spec: - name: MONGODB_REPO_URL value: quay.io/mongodb - name: MDB_IMAGE_TYPE - value: ubi8 + value: ubi9 - name: PERFORM_FAILOVER value: 'true' - name: MDB_MAX_CONCURRENT_RECONCILES - value: "1" + value: "10" - name: POD_NAME valueFrom: fieldRef: @@ -544,9 +586,9 @@ spec: value: "ubi8" # Community Env Vars End - name: MDB_SEARCH_COMMUNITY_REPO_URL - value: "quay.io/mongodb" + value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com" - name: MDB_SEARCH_COMMUNITY_NAME - value: "mongodb-search-community" + value: "mongot/community" - name: MDB_SEARCH_COMMUNITY_VERSION value: "1.47.0" diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0315_wait_for_community_resource.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0315_wait_for_community_resource.out new file mode 100644 index 000000000..2bc88b5b9 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0315_wait_for_community_resource.out @@ -0,0 +1,16 @@ +Waiting for MongoDBCommunity resource to reach Running phase... +mongodbcommunity.mongodbcommunity.mongodb.com/mdbc-rs condition met + +MongoDBCommunity resource +NAME PHASE VERSION +mdbc-rs Running 8.0.10 + +Pods running in cluster kind-kind +NAME READY STATUS RESTARTS AGE +mdb-debug-mdbc-rs-0-0 1/1 Running 0 96s +mdb-debug-mdbc-rs-1-0 1/1 Running 0 95s +mdb-debug-mdbc-rs-2-0 1/1 Running 0 95s +mdbc-rs-0 2/2 Running 0 2m41s +mdbc-rs-1 2/2 Running 0 87s +mdbc-rs-2 2/2 Running 0 38s +mongodb-kubernetes-operator-696b5dd864-kpgkl 1/1 Running 0 2m49s diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0330_wait_for_community_resource.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0330_wait_for_community_resource.out new file mode 100644 index 000000000..6971e0146 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0330_wait_for_community_resource.out @@ -0,0 +1,2 @@ +Waiting for MongoDBCommunity resource to reach Running phase... +mongodbcommunity.mongodbcommunity.mongodb.com/mdbc-rs condition met diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0335_show_running_pods.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0335_show_running_pods.out new file mode 100644 index 000000000..6c2bcf86a --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/01_0335_show_running_pods.out @@ -0,0 +1,20 @@ + +MongoDBCommunity resource +NAME PHASE VERSION +mdbc-rs Running 8.0.10 + +MongoDBSearch resource +NAME PHASE AGE +mdbc-rs Running 5m33s + +Pods running in cluster kind-kind +NAME READY STATUS RESTARTS AGE +mdb-debug-mdbc-rs-0-0 1/1 Running 0 7m12s +mdb-debug-mdbc-rs-1-0 1/1 Running 0 7m11s +mdb-debug-mdbc-rs-2-0 1/1 Running 0 7m11s +mdb-debug-mdbc-rs-search-0-0 1/1 Running 0 5m33s +mdbc-rs-0 2/2 Running 1 (31s ago) 8m17s +mdbc-rs-1 2/2 Running 1 (3m8s ago) 7m3s +mdbc-rs-2 2/2 Running 1 (109s ago) 6m14s +mdbc-rs-search-0 1/1 Running 4 (4m17s ago) 5m34s +mongodb-kubernetes-operator-696b5dd864-kpgkl 1/1 Running 0 8m25s diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0420_import_movies_mflix_database.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0420_import_movies_mflix_database.out new file mode 100644 index 000000000..a7432faf0 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0420_import_movies_mflix_database.out @@ -0,0 +1,2 @@ +Downloading sample database archive... +Restoring sample database diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0440_wait_for_search_index_ready.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0440_wait_for_search_index_ready.out new file mode 100644 index 000000000..b264580af --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0440_wait_for_search_index_ready.out @@ -0,0 +1 @@ +Sleeping to wait for search indexes to be created diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0444_list_search_indexes.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0444_list_search_indexes.out new file mode 100644 index 000000000..871ba5e65 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0444_list_search_indexes.out @@ -0,0 +1,32 @@ +{ + cursor: { + id: 0, + ns: 'sample_mflix.movies', + firstBatch: [ + { + id: '68a9975db53fad6a875bb74f', + name: 'default', + type: 'search', + latestDefinition: { + indexID: ObjectId('68a9975db53fad6a875bb74f'), + name: 'default', + database: 'sample_mflix', + lastObservedCollectionName: 'movies', + collectionUUID: UUID('b28e600a-fd5f-459f-9a80-1cd85a113261'), + numPartitions: 1, + mappings: { dynamic: true, fields: {} }, + indexFeatureVersion: 3 + } + } + ] + }, + ok: 1, + '$clusterTime': { + clusterTime: Timestamp({ t: 1755944851, i: 1 }), + signature: { + hash: Binary.createFromBase64('P3ygPKAHEg7beuDCsygB5MSm0xQ=', 0), + keyId: Long('7541723951982968838') + } + }, + operationTime: Timestamp({ t: 1755944851, i: 1 }) +} diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0445_list_vector_search_indexes.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0445_list_vector_search_indexes.out new file mode 100644 index 000000000..2b7013164 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0445_list_vector_search_indexes.out @@ -0,0 +1,40 @@ +{ + cursor: { + id: 0, + ns: 'sample_mflix.embedded_movies', + firstBatch: [ + { + id: '68a9975eb53fad6a875bb750', + name: 'vector_index', + type: 'vectorSearch', + latestDefinition: { + type: 'vectorSearch', + indexID: ObjectId('68a9975eb53fad6a875bb750'), + name: 'vector_index', + database: 'sample_mflix', + lastObservedCollectionName: 'embedded_movies', + collectionUUID: UUID('19e50df1-f30c-47ae-9a98-1b0986f19d1e'), + numPartitions: 1, + fields: [ + { + type: 'vector', + path: 'plot_embedding_voyage_3_large', + numDimensions: 2048, + similarity: 'dotProduct', + quantization: 'scalar' + } + ] + } + } + ] + }, + ok: 1, + '$clusterTime': { + clusterTime: Timestamp({ t: 1755944861, i: 1 }), + signature: { + hash: Binary.createFromBase64('MpVLnzPwR4lpliG75kYSEMdvHXk=', 0), + keyId: Long('7541723951982968838') + } + }, + operationTime: Timestamp({ t: 1755944861, i: 1 }) +} diff --git a/docs/community-search/quick-start/output/0450_execute_search_query.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0450_execute_search_query.out similarity index 100% rename from docs/community-search/quick-start/output/0450_execute_search_query.out rename to scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0450_execute_search_query.out diff --git a/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0455_execute_vector_search_query.out b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0455_execute_vector_search_query.out new file mode 100644 index 000000000..fb9f3de41 --- /dev/null +++ b/scripts/code_snippets/tests/outputs/test_kind_search_community_snippets/03_0455_execute_vector_search_query.out @@ -0,0 +1,54 @@ +mdbc-rs [primary] test> switched to db sample_mflix +mdbc-rs [primary] sample_mflix> ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... [ + { + plot: 'At the age of 21, Tim discovers he can travel in time and change what happens and has happened in his own life. His decision to make his world a better place by getting a girlfriend turns out not to be as easy as you might think.', + title: 'About Time', + score: 0.7704131603240967 + }, + { + plot: 'A psychiatrist makes multiple trips through time to save a woman that was murdered by her brutal husband.', + title: 'Retroactive', + score: 0.7597770690917969 + }, + { + plot: 'An officer for a security agency that regulates time travel, must fend for his life against a shady politician who has a tie to his past.', + title: 'Timecop', + score: 0.7574796676635742 + }, + { + plot: 'A time-travel experiment in which a robot probe is sent from the year 2073 to the year 1973 goes terribly wrong thrusting one of the project scientists, a man named Nicholas Sinclair into a...', + title: 'A.P.E.X.', + score: 0.7573235034942627 + }, + { + plot: 'After visiting 2015, Marty McFly must repeat his visit to 1955 to prevent disastrous changes to 1985... without interfering with his first trip.', + title: 'Back to the Future Part II', + score: 0.751945972442627 + }, + { + plot: 'A reporter, learning of time travelers visiting 20th century disasters, tries to change the history they know by averting upcoming disasters.', + title: 'Thrill Seekers', + score: 0.7503504753112793 + }, + { + plot: 'Hoping to alter the events of the past, a 19th century inventor instead travels 800,000 years into the future, where he finds humankind divided into two warring races.', + title: 'The Time Machine', + score: 0.750007152557373 + }, + { + plot: 'Lyle, a motorcycle champion is traveling the Mexican desert, when he find himself in the action radius of a time machine. So he find himself one century back in the past between rapists, ...', + title: 'Timerider: The Adventure of Lyle Swann', + score: 0.7499568462371826 + }, + { + plot: 'A romantic drama about a Chicago librarian with a gene that causes him to involuntarily time travel, and the complications it creates for his marriage.', + title: "The Time Traveler's Wife", + score: 0.7492842674255371 + }, + { + plot: 'A modern aircraft carrier is thrown back in time to 1941 near Hawaii, just hours before the Japanese attack on Pearl Harbor.', + title: 'The Final Countdown', + score: 0.7472751140594482 + } +] +mdbc-rs [primary] sample_mflix> \ No newline at end of file diff --git a/scripts/code_snippets/tests/test_gke_multi_cluster_no_mesh_snippets.sh b/scripts/code_snippets/tests/test_gke_multi_cluster_no_mesh_snippets.sh new file mode 100755 index 000000000..0eff029ff --- /dev/null +++ b/scripts/code_snippets/tests/test_gke_multi_cluster_no_mesh_snippets.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash + +set -eou pipefail +source scripts/dev/set_env_context.sh + +script_name=$(readlink -f "${BASH_SOURCE[0]}") + +_SNIPPETS_OUTPUT_DIR="$(dirname "${script_name}")/outputs/$(basename "${script_name%.*}")" +export _SNIPPETS_OUTPUT_DIR +mkdir -p "${_SNIPPETS_OUTPUT_DIR}" + +function cleanup() { + if [ "${code_snippets_teardown:-true}" = true ]; then + echo "Deleting clusters and resources" + ./public/architectures/ra-10-ops-manager-mc-no-mesh/teardown.sh & + ./public/architectures/setup-multi-cluster/ra-09-setup-externaldns/teardown.sh & + wait + + ./public/architectures/setup-multi-cluster/ra-01-setup-gke/teardown.sh + elif [ "${code_snippets_reset:-false}" = true ]; then + echo "Deleting resources, keeping the clusters" + ./public/architectures/ra-10-ops-manager-mc-no-mesh/teardown.sh & + ./public/architectures/ra-11-mongodb-sharded-mc-no-mesh/teardown.sh & + ./public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/teardown.sh & + ./public/architectures/setup-multi-cluster/ra-09-setup-externaldns/teardown.sh & + wait + + ./public/architectures/setup-multi-cluster/ra-02-setup-operator/teardown.sh + else + echo "Not deleting anything" + fi +} + +dump_logs() { + scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh "${K8S_CLUSTER_0_CONTEXT_NAME}" + scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh "${K8S_CLUSTER_1_CONTEXT_NAME}" + scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh "${K8S_CLUSTER_2_CONTEXT_NAME}" +} + +cmd=${1:-""} +if [[ "${cmd}" == "dump_logs" ]]; then + source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh + dump_logs + exit 0 +elif [[ "${cmd}" == "cleanup" ]]; then + source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh + cleanup + exit 0 +fi + +function on_exit() { + dump_logs + cleanup +} + +trap on_exit EXIT + +source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh +# we need some env vars, e.g. OM_NAMESPACE for teardown in case setup gke is failing +source public/architectures/setup-multi-cluster/ra-02-setup-operator/env_variables.sh + +./public/architectures/setup-multi-cluster/ra-01-setup-gke/test.sh + +./public/architectures/setup-multi-cluster/ra-02-setup-operator/test.sh + +./public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/test.sh + +source public/architectures/setup-multi-cluster/ra-09-setup-externaldns/env_variables.sh +./public/architectures/setup-multi-cluster/ra-09-setup-externaldns/test.sh + +source public/architectures/ra-10-ops-manager-mc-no-mesh/env_variables.sh +./public/architectures/ra-10-ops-manager-mc-no-mesh/test.sh + +source public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/env_variables.sh +./public/architectures/ra-12-mongodb-replicaset-mc-no-mesh/test.sh + +source public/architectures/ra-11-mongodb-sharded-mc-no-mesh/env_variables.sh +./public/architectures/ra-11-mongodb-sharded-mc-no-mesh/test.sh diff --git a/scripts/code_snippets/tests/test_gke_multi_cluster_snippets.sh b/scripts/code_snippets/tests/test_gke_multi_cluster_snippets.sh new file mode 100755 index 000000000..614d167f4 --- /dev/null +++ b/scripts/code_snippets/tests/test_gke_multi_cluster_snippets.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash + +set -eou pipefail +source scripts/dev/set_env_context.sh + +script_name=$(readlink -f "${BASH_SOURCE[0]}") + +_SNIPPETS_OUTPUT_DIR="$(dirname "${script_name}")/outputs/$(basename "${script_name%.*}")" +export _SNIPPETS_OUTPUT_DIR +mkdir -p "${_SNIPPETS_OUTPUT_DIR}" + +function cleanup() { + if [ "${code_snippets_teardown:-true}" = true ]; then + echo "Deleting clusters" + ./public/architectures/setup-multi-cluster/ra-01-setup-gke/teardown.sh + elif [ "${code_snippets_reset:-false}" = true ]; then + echo "Deleting resources, keeping the clusters" + ./public/architectures/ra-06-ops-manager-multi-cluster/teardown.sh & + ./public/architectures/ra-08-mongodb-sharded-multi-cluster/teardown.sh & + ./public/architectures/ra-07-mongodb-replicaset-multi-cluster/teardown.sh & + wait + + ./public/architectures/setup-multi-cluster/ra-02-setup-operator/teardown.sh + else + echo "Not deleting anything" + fi +} + +dump_logs() { + scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh "${K8S_CLUSTER_0_CONTEXT_NAME}" + scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh "${K8S_CLUSTER_1_CONTEXT_NAME}" + scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh "${K8S_CLUSTER_2_CONTEXT_NAME}" +} + +cmd=${1:-""} +if [[ "${cmd}" == "dump_logs" ]]; then + source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh + dump_logs + exit 0 +elif [[ "${cmd}" == "cleanup" ]]; then + source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh + cleanup + exit 0 +fi +# if no cmd, proceed with the test normally +function on_exit() { + dump_logs + cleanup +} + +trap on_exit EXIT + + +source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh +./public/architectures/setup-multi-cluster/ra-01-setup-gke/test.sh + +source public/architectures/setup-multi-cluster/ra-02-setup-operator/env_variables.sh +./public/architectures/setup-multi-cluster/ra-02-setup-operator/test.sh + +./public/architectures/setup-multi-cluster/ra-03-setup-istio/test.sh + +./public/architectures/setup-multi-cluster/ra-04-verify-connectivity/test.sh + +./public/architectures/setup-multi-cluster/ra-05-setup-cert-manager/test.sh + +source public/architectures/ra-06-ops-manager-multi-cluster/env_variables.sh +./public/architectures/ra-06-ops-manager-multi-cluster/test.sh + +source public/architectures/ra-07-mongodb-replicaset-multi-cluster/env_variables.sh +./public/architectures/ra-07-mongodb-replicaset-multi-cluster/test.sh + +source public/architectures/ra-08-mongodb-sharded-multi-cluster/env_variables.sh +./public/architectures/ra-08-mongodb-sharded-multi-cluster/test.sh diff --git a/scripts/code_snippets/task_kind_community_search_snippets_test.sh b/scripts/code_snippets/tests/test_kind_search_community_snippets.sh similarity index 81% rename from scripts/code_snippets/task_kind_community_search_snippets_test.sh rename to scripts/code_snippets/tests/test_kind_search_community_snippets.sh index 4b4501c2c..fa5f12c62 100755 --- a/scripts/code_snippets/task_kind_community_search_snippets_test.sh +++ b/scripts/code_snippets/tests/test_kind_search_community_snippets.sh @@ -5,7 +5,7 @@ source scripts/dev/set_env_context.sh dump_logs() { source scripts/evergreen/e2e/dump_diagnostic_information.sh - dump_all_non_default_namespaces "$@" + dump_all_non_default_namespaces "${K8S_CLUSTER_0_CONTEXT_NAME}" } trap dump_logs EXIT @@ -17,4 +17,3 @@ echo "Sourcing env variables for ${CODE_SNIPPETS_FLAVOR} flavor" test -f "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh" && source "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh" ${test_dir}/test.sh -scripts/code_snippets/kind_community_search_snippets_render_template.sh diff --git a/scripts/code_snippets/validate_snippets.py b/scripts/code_snippets/validate_snippets.py new file mode 100755 index 000000000..be797add9 --- /dev/null +++ b/scripts/code_snippets/validate_snippets.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python3 + +import os +import sys +from collections import defaultdict + + +def find_snippet_directories(): + """Find all directories containing both test.sh and code_snippets subdirectory.""" + snippet_dirs = [] + + # Traverse current directory recursively to find test.sh files + for root, dirs, files in os.walk("."): + if "test.sh" in files: + # Check if this directory also has a code_snippets subdirectory + code_snippets_path = os.path.join(root, "code_snippets") + if os.path.isdir(code_snippets_path): + snippet_dirs.append(root) + + return snippet_dirs + + +def verify_snippets_files_are_unique(): + """Check if files in snippet directories have unique names across all directories.""" + dirs = find_snippet_directories() + + if not dirs: + print("No snippet directories found (no test.sh files).") + return True + + file_map = defaultdict(list) + + print(f"Checking for duplicate file names across code snippet directories:\n {"\t\n".join(dirs)}") + + # Scan all files in code_snippets subdirectories only + for snippet_dir in dirs: + code_snippets_dir = os.path.join(snippet_dir, "code_snippets") + if os.path.exists(code_snippets_dir): + for file in os.listdir(code_snippets_dir): + file_path = os.path.join(code_snippets_dir, file) + if os.path.isfile(file_path): + file_map[file].append(file_path) + + # Check for duplicates + duplicates_found = False + for filename, paths in file_map.items(): + if len(paths) > 1: + if not duplicates_found: + print("ERROR: Duplicate file names found:") + duplicates_found = True + print(f" File '{filename}' appears in multiple locations:") + for path in sorted(paths): + print(f" {path}") + print() + + if duplicates_found: + print("Failure - please rename duplicate files to ensure uniqueness across all snippet directories.") + return False + else: + print("OK - all snippets have unique names across directories.") + return True + + +if __name__ == "__main__": + checks = [verify_snippets_files_are_unique()] + + # Exit 0 if all checks pass, 1 if any fail + sys.exit(0 if all(checks) else 1) diff --git a/scripts/dev/contexts/prerelease_gke_code_snippets b/scripts/dev/contexts/prerelease_gke_code_snippets index 61a07676f..c07a18630 100644 --- a/scripts/dev/contexts/prerelease_gke_code_snippets +++ b/scripts/dev/contexts/prerelease_gke_code_snippets @@ -10,7 +10,7 @@ script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" export MDB_GKE_PROJECT="scratch-kubernetes-team" -export K8S_CLUSTER_SUFFIX="-${version_id}-${RANDOM}" +export K8S_CLUSTER_SUFFIX="${K8S_CLUSTER_SUFFIX:-"-${version_id}-${RANDOM}"}" export CODE_SNIPPETS_COMMIT_OUTPUT=true # we reset evg host to use a default ~/.kube/config for GKE instead of the one from evg host diff --git a/scripts/dev/contexts/private_gke_code_snippets b/scripts/dev/contexts/private_gke_code_snippets index 50bc169ce..c88583802 100644 --- a/scripts/dev/contexts/private_gke_code_snippets +++ b/scripts/dev/contexts/private_gke_code_snippets @@ -10,8 +10,10 @@ script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" source "${script_dir}/variables/om80" +export KUBE_ENVIRONMENT_NAME=multi + export MDB_GKE_PROJECT="scratch-kubernetes-team" -export K8S_CLUSTER_SUFFIX="-${version_id}-${RANDOM}" +export K8S_CLUSTER_SUFFIX="${K8S_CLUSTER_SUFFIX:-"-${version_id}-${RANDOM}"}" # we reset evg host to use a default ~/.kube/config for GKE instead of the one from evg host export EVG_HOST_NAME="" diff --git a/scripts/dev/contexts/private_kind_code_snippets b/scripts/dev/contexts/private_kind_code_snippets index 704957a6f..6ae3751d8 100644 --- a/scripts/dev/contexts/private_kind_code_snippets +++ b/scripts/dev/contexts/private_kind_code_snippets @@ -8,6 +8,9 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}") script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" +source "${script_dir}/e2e_mdb_community" export NAMESPACE=mongodb export CODE_SNIPPETS_FLAVOR=e2e_private + +export ops_manager_version="cloud_qa" diff --git a/scripts/dev/contexts/public_gke_code_snippets b/scripts/dev/contexts/public_gke_code_snippets index dddae3db9..6cc413dc4 100644 --- a/scripts/dev/contexts/public_gke_code_snippets +++ b/scripts/dev/contexts/public_gke_code_snippets @@ -9,9 +9,11 @@ script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" +export KUBE_ENVIRONMENT_NAME=multi + export MDB_GKE_PROJECT="scratch-kubernetes-team" # shellcheck disable=SC2154 -export K8S_CLUSTER_SUFFIX="-${version_id}-${RANDOM}" +export K8S_CLUSTER_SUFFIX="${K8S_CLUSTER_SUFFIX:-"-${version_id}-${RANDOM}"}" # we reset evg host to use a default ~/.kube/config for GKE instead of the one from evg host export EVG_HOST_NAME="" diff --git a/scripts/evergreen/e2e/dump_diagnostic_information.sh b/scripts/evergreen/e2e/dump_diagnostic_information.sh index f4ea7b986..f6cc27c76 100755 --- a/scripts/evergreen/e2e/dump_diagnostic_information.sh +++ b/scripts/evergreen/e2e/dump_diagnostic_information.sh @@ -8,12 +8,11 @@ set +e source scripts/funcs/printing -dump_all_non_default_namespaces() { - echo "Gathering logs from all non-default namespaces" +_dump_all_non_default_namespaces() { + local context="${1}" local original_context original_context="$(kubectl config current-context)" - kubectl config use-context "${1:-${original_context}}" &> /dev/null prefix="${1:-${original_context}}_" # shellcheck disable=SC2154 if [[ "${KUBE_ENVIRONMENT_NAME:-}" != "multi" ]]; then @@ -21,36 +20,40 @@ dump_all_non_default_namespaces() { fi mkdir -p logs - namespaces=$(kubectl get namespace --output=jsonpath="{.items[*].metadata.name}" | tr ' ' '\n' | \ + namespaces=$(kubectl --context="${context}" get namespace --output=jsonpath="{.items[*].metadata.name}" | tr ' ' '\n' | \ grep -v "default" | \ grep -v "kube-node-lease" | \ grep -v "kube-node-lease" | \ grep -v "kube-public" | \ grep -v "kube-system" | \ grep -v "local-path-storage" | \ + grep -v "gmp-" | \ + grep -v "gke-managed" | \ + grep -v "local-path-storage" | \ + grep -v "local-path-storage" | \ grep -v "metallb-system" ) for ns in ${namespaces}; do - if kubectl get namespace "${ns}" -o jsonpath='{.metadata.annotations}'; then + if kubectl --context="${context}" get namespace "${ns}" -o jsonpath='{.metadata.annotations}'; then echo "Dumping all diagnostic information for namespace ${ns}" - dump_namespace "${ns}" "${prefix}" + dump_namespace "${context}" "${ns}" "${prefix}" fi done } -dump_all() { +dump_all_non_default_namespaces() { + local context="${1}" + _dump_all_non_default_namespaces "$@" 2>&1 | prepend "${context}" +} + +_dump_all() { [[ "${MODE-}" = "dev" ]] && return mkdir -p logs - # TODO: provide a cleaner way of handling this. For now we run the same command with kubectl configured - # with a different context. - local original_context - original_context="$(kubectl config current-context)" - kubectl config use-context "${1:-${original_context}}" &> /dev/null - prefix="${1:-${original_context}}_" - # shellcheck disable=SC2154 + local context="${1}" + prefix="${context}_" if [[ "${KUBE_ENVIRONMENT_NAME:-}" != "multi" ]]; then prefix="" fi @@ -59,197 +62,241 @@ dump_all() { # but in some exceptional cases (e.g. clusterwide operator) there can be more than 1 namespace to print diagnostics # In this case the python test app may create the test namespace and add necessary labels and annotations so they # would be dumped for diagnostics as well - for ns in $(kubectl get namespace -l "evg=task" --output=jsonpath={.items..metadata.name}); do - if kubectl get namespace "${ns}" -o jsonpath='{.metadata.annotations}' | grep -q "${task_id:-'not-specified'}"; then + for ns in $(kubectl --context="${context}" get namespace -l "evg=task" --output=jsonpath={.items..metadata.name}); do + if kubectl --context="${context}" get namespace "${ns}" -o jsonpath='{.metadata.annotations}' | grep -q "${task_id:-'not-specified'}"; then echo "Dumping all diagnostic information for namespace ${ns}" - dump_namespace "${ns}" "${prefix}" + dump_namespace "${context}" "${ns}" "${prefix}" fi done - if kubectl get namespace "olm" &>/dev/null; then + if kubectl --context="${context}" get namespace "olm" &>/dev/null; then echo "Dumping olm namespace" - dump_namespace "olm" "olm" + dump_namespace "${context}" "olm" "olm" fi - kubectl config use-context "${original_context}" &> /dev/null + kubectl --context="${context}" -n "kube-system" get configmap coredns -o yaml > "logs/${prefix}coredns.yaml" - kubectl -n "kube-system" get configmap coredns -o yaml > "logs/${prefix}coredns.yaml" + kubectl --context="${context}" events --all-namespaces > "logs/${prefix}kube_events.json" +} - kubectl events --all-namespaces > "logs/${prefix}kube_events.json" +dump_all() { + local context="${1}" + _dump_all "$@" 2>&1 | prepend "${context}" } dump_objects() { - local object=$1 - local msg=$2 - local namespace=${3} - local action=${4:-get -o yaml} + local context=$1 + local object=$2 + local msg=$3 + local namespace=${4} + local action=${5:-get -o yaml} + local out_file=${6:-""} + + # First check if the resource type exists + if ! kubectl --context="${context}" get "${object}" --no-headers -o name -n "${namespace}" >/dev/null 2>&1; then + # Resource type doesn't exist, skip silently + return + fi + + # Check if there are any objects of this type + local resource_count + resource_count=$(kubectl --context="${context}" get "${object}" --no-headers -o name -n "${namespace}" 2>/dev/null | wc -l) + if [ "${resource_count}" -eq 0 ]; then + # Resource type exists but no objects of this type, return + return + fi + + # Capture output first to check if it contains actual resources + local temp_output + temp_output=$(kubectl --context="${context}" -n "${namespace}" "${action}" "${object}" 2>&1) - if [ "$(kubectl get "${object}" --no-headers -o name -n "${namespace}" | wc -l)" = "0" ]; then - # if no objects of this type, return + # Check if output contains actual resources (not just empty list) + # Skip if it's an empty YAML list (contains "items: []") + if printf '%s\n' "${temp_output}" | grep -Fq "items: []"; then + # Empty list, don't create file return fi - header "${msg}" - # shellcheck disable=SC2086 - kubectl -n "${namespace}" ${action} "${object}" 2>&1 + if [[ -n "${out_file}" ]]; then + { + header "${msg}" + echo "${temp_output}" + } > "${out_file}" + else + header "${msg}" + kubectl --context="${context}" -n "${namespace}" "${action}" "${object}" 2>&1 + fi } # get_operator_managed_pods returns a list of names of the Pods that are managed # by the Operator. get_operator_managed_pods() { - local namespace=${1} - kubectl get pods --namespace "${namespace}" --selector=controller=mongodb-enterprise-operator --no-headers -o custom-columns=":metadata.name" + local context=${1} + local namespace=${2} + kubectl --context="${context}" get pods --namespace "${namespace}" --selector=controller=mongodb-enterprise-operator --no-headers -o custom-columns=":metadata.name" } get_all_pods() { - local namespace=${1} - kubectl get pods --namespace "${namespace}" --no-headers -o custom-columns=":metadata.name" + local context=${1} + local namespace=${2} + kubectl --context="${context}" get pods --namespace "${namespace}" --no-headers -o custom-columns=":metadata.name" } is_mdb_resource_pod() { - local pod="${1}" - local namespace="${2}" + local context="${1}" + local pod="${2}" + local namespace="${3}" - kubectl exec "${pod}" -n "${namespace}" -- ls /var/log/mongodb-mms-automation/automation-agent-verbose.log &>/dev/null + kubectl --context="${context}" exec "${pod}" -n "${namespace}" -- ls /var/log/mongodb-mms-automation/automation-agent-verbose.log &>/dev/null } # dump_pod_logs dumps agent and mongodb logs. dump_pod_logs() { - local pod="${1}" - local namespace="${2}" - local prefix="${3}" + local context="${1}" + local pod="${2}" + local namespace="${3}" + local prefix="${4}" - if is_mdb_resource_pod "${pod}" "${namespace}"; then + if is_mdb_resource_pod "${context}" "${pod}" "${namespace}"; then # for MDB resource Pods, we dump the log files from the file system echo "Writing agent and mongodb logs for pod ${pod} to logs" - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/automation-agent-verbose.log" "logs/${prefix}${pod}-agent-verbose.log" &> /dev/null - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/automation-agent.log" "logs/${prefix}${pod}-agent.log" &> /dev/null - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/monitoring-agent-verbose.log" "logs/${prefix}${pod}-monitoring-agent-verbose.log" &> /dev/null - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/monitoring-agent.log" "logs/${prefix}${pod}-monitoring-agent.log" &> /dev/null - kubectl logs -n "${namespace}" "${pod}" -c "mongodb-agent-monitoring" > "logs/${prefix}${pod}-monitoring-agent-stdout.log" || true - kubectl logs -n "${namespace}" "${pod}" -c "mongod" > "logs/${prefix}${pod}-mongod-container.log" || true - kubectl logs -n "${namespace}" "${pod}" -c "mongodb-agent" > "logs/${prefix}${pod}-mongodb-agent-container.log" || true - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/mongodb.log" "logs/${prefix}${pod}-mongodb.log" &> /dev/null || true + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/automation-agent-verbose.log" "logs/${prefix}${pod}-agent-verbose.log" &> /dev/null + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/automation-agent.log" "logs/${prefix}${pod}-agent.log" &> /dev/null + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/monitoring-agent-verbose.log" "logs/${prefix}${pod}-monitoring-agent-verbose.log" &> /dev/null + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/monitoring-agent.log" "logs/${prefix}${pod}-monitoring-agent.log" &> /dev/null + kubectl --context="${context}" logs -n "${namespace}" "${pod}" -c "mongodb-agent-monitoring" > "logs/${prefix}${pod}-monitoring-agent-stdout.log" || true + kubectl --context="${context}" logs -n "${namespace}" "${pod}" -c "mongod" > "logs/${prefix}${pod}-mongod-container.log" || true + kubectl --context="${context}" logs -n "${namespace}" "${pod}" -c "mongodb-agent" > "logs/${prefix}${pod}-mongodb-agent-container.log" || true + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/mongodb.log" "logs/${prefix}${pod}-mongodb.log" &> /dev/null || true # note that this file may get empty if the logs have already grew too much - seems it's better to have it explicitly empty then just omit - kubectl logs -n "${namespace}" "${pod}" | jq -c -r 'select( .logType == "agent-launcher-script") | .contents' 2> /dev/null > "logs/${prefix}${pod}-launcher.log" + kubectl --context="${context}" logs -n "${namespace}" "${pod}" | jq -c -r 'select( .logType == "agent-launcher-script") | .contents' 2> /dev/null > "logs/${prefix}${pod}-launcher.log" else # for all other pods we want each log per container from kubectl - for container in $(kubectl get pods -n "${namespace}" "${pod}" -o jsonpath='{.spec.containers[*].name}'); do - echo "Writing log file for pod ${pod} - container ${container} to logs/${pod}-${container}.log" - kubectl logs -n "${namespace}" "${pod}" -c "${container}" > "logs/${pod}-${container}.log" + for container in $(kubectl --context="${context}" get pods -n "${namespace}" "${pod}" -o jsonpath='{.spec.containers[*].name}'); do + echo "Writing log file for pod ${pod} - container ${container} to logs/${prefix}${pod}-${container}.log" + kubectl --context="${context}" logs -n "${namespace}" "${pod}" -c "${container}" > "logs/${prefix}${pod}-${container}.log" # Check if the container has restarted by examining its restart count - restartCount=$(kubectl get pod -n "${namespace}" "${pod}" -o jsonpath="{.status.containerStatuses[?(@.name=='${container}')].restartCount}") + restartCount=$(kubectl --context="${context}" get pod -n "${namespace}" "${pod}" -o jsonpath="{.status.containerStatuses[?(@.name=='${container}')].restartCount}") if [ "${restartCount}" -gt 0 ]; then - echo "Writing log file for restarted ${pod} - container ${container} to logs/${pod}-${container}-previous.log" - kubectl logs --previous -n "${namespace}" "${pod}" -c "${container}" > "logs/${pod}-${container}-previous.log" || true + echo "Writing log file for restarted ${pod} - container ${container} to logs/${prefix}${pod}-${container}-previous.log" + kubectl --context="${context}" logs --previous -n "${namespace}" "${pod}" -c "${container}" > "logs/${prefix}${pod}-${container}-previous.log" || true fi done fi - if kubectl exec "${pod}" -n "${namespace}" -- ls /var/log/mongodb-mms-automation/automation-agent-stderr.log &>/dev/null; then - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/automation-agent-stderr.log" "logs/${prefix}${pod}-agent-stderr.log" &> /dev/null + if kubectl --context="${context}" exec "${pod}" -n "${namespace}" -- ls /var/log/mongodb-mms-automation/automation-agent-stderr.log &>/dev/null; then + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/automation-agent-stderr.log" "logs/${prefix}${pod}-agent-stderr.log" &> /dev/null fi } # dump_pod_readiness_state dumps readiness and agent-health-status files. dump_pod_readiness_state() { - local pod="${1}" - local namespace="${2}" - local prefix="${3}" + local context="${1}" + local pod="${2}" + local namespace="${3}" + local prefix="${4}" # kubectl cp won't create any files if the file doesn't exist in the container agent_health_status="logs/${prefix}${pod}-agent-health-status.json" echo "Writing agent ${agent_health_status}" - kubectl cp -c "mongodb-agent" "${namespace}/${pod}:/var/log/mongodb-mms-automation/agent-health-status.json" "${agent_health_status}" &> /dev/null + kubectl --context="${context}" cp -c "mongodb-agent" "${namespace}/${pod}:/var/log/mongodb-mms-automation/agent-health-status.json" "${agent_health_status}" &> /dev/null ([[ -f "${agent_health_status}" ]] && jq . < "${agent_health_status}" > tmpfile && mv tmpfile "${agent_health_status}") if [[ ! -f "${agent_health_status}" ]]; then echo "Agent health status not found; trying community health status: " - kubectl cp -c "mongodb-agent" "${namespace}/${pod}:/var/log/mongodb-mms-automation/healthstatus/agent-health-status.json" "${agent_health_status}" &> /dev/null + kubectl --context="${context}" cp -c "mongodb-agent" "${namespace}/${pod}:/var/log/mongodb-mms-automation/healthstatus/agent-health-status.json" "${agent_health_status}" &> /dev/null ([[ -f "${agent_health_status}" ]] && jq . < "${agent_health_status}" > tmpfile && mv tmpfile "${agent_health_status}") fi - kubectl cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/readiness.log" "logs/${prefix}${pod}-readiness.log" &> /dev/null + kubectl --context="${context}" cp "${namespace}/${pod}:/var/log/mongodb-mms-automation/readiness.log" "logs/${prefix}${pod}-readiness.log" &> /dev/null } # dump_pod_config dumps mongod configuration and cluster-config. dump_pod_config() { - local pod="${1}" - local namespace="${2}" - local prefix="${3}" + local context="${1}" + local pod="${2}" + local namespace="${3}" + local prefix="${4}" # cluster-config.json is a mounted volume and the actual file is located in the "..data" directory pod_cluster_config="logs/${prefix}${pod}-cluster-config.json" - kubectl cp "${namespace}/${pod}:/var/lib/mongodb-automation/..data/cluster-config.json" "${pod_cluster_config}" &> /dev/null + kubectl --context="${context}" cp "${namespace}/${pod}:/var/lib/mongodb-automation/..data/cluster-config.json" "${pod_cluster_config}" &> /dev/null ([[ -f "${pod_cluster_config}" ]] && jq . < "${pod_cluster_config}" > tmpfile && mv tmpfile "${pod_cluster_config}") # Mongodb Configuration - kubectl cp "${namespace}/${pod}:data/automation-mongod.conf" "logs/${prefix}${pod}-automation-mongod.conf" &> /dev/null + kubectl --context="${context}" cp "${namespace}/${pod}:data/automation-mongod.conf" "logs/${prefix}${pod}-automation-mongod.conf" &> /dev/null } dump_configmaps() { - local namespace="${1}" - local prefix="${2}" - kubectl -n "${namespace}" get configmaps -o yaml > "logs/${prefix}z_configmaps.txt" + local context="${1}" + local namespace="${2}" + local prefix="${3}" + kubectl --context="${context}" -n "${namespace}" get configmaps -o yaml > "logs/${prefix}z_configmaps.txt" } decode_secret() { - local secret=${1} - local namespace=${2} + local context=${1} + local secret=${2} + local namespace=${3} - kubectl get secret "${secret}" -o json -n "${namespace}" | jq -r '.data | with_entries(.value |= @base64d)' 2> /dev/null + kubectl --context="${context}" get secret "${secret}" -o json -n "${namespace}" | jq -r '.data | with_entries(.value |= @base64d)' 2> /dev/null } dump_secrets() { - local namespace="${1}" - local prefix="${2}" - for secret in $(kubectl get secrets -n "${namespace}" --no-headers | grep -v service-account-token | grep -v dockerconfigjson | awk '{ print $1 }'); do - decode_secret "${secret}" "${namespace}" > "logs/${prefix}z_secret_${secret}.txt" + local context="${1}" + local namespace="${2}" + local prefix="${3}" + for secret in $(kubectl --context="${context}" get secrets -n "${namespace}" --no-headers | grep -v service-account-token | grep -v dockerconfigjson | awk '{ print $1 }'); do + decode_secret "${context}" "${secret}" "${namespace}" > "logs/${prefix}z_secret_${secret}.txt" done } dump_services() { - local namespace="${1}" - local prefix="${2}" - kubectl -n "${namespace}" get svc -o yaml > "logs/${prefix}z_services.txt" + local context="${1}" + local namespace="${2}" + local prefix="${3}" + kubectl --context="${context}" -n "${namespace}" get svc -o yaml > "logs/${prefix}z_services.txt" } dump_metrics() { - local namespace="${1}" - local operator_pod="${2}" - kubectl exec -it "${operator_pod}" -n "${namespace}" -- curl localhost:8080/metrics > "logs/metrics_${operator_pod}.txt" + local context="${1}" + local namespace="${2}" + local operator_pod="${3}" + local prefix="${4}" + kubectl --context="${context}" exec -it "${operator_pod}" -n "${namespace}" -- curl localhost:8080/metrics > "logs/${prefix}metrics_${operator_pod}.txt" } # dump_pods writes logs for each relevant Pod in the namespace: agent, mongodb # logs, etc. dump_pods() { - local namespace="${1}" - local prefix="${2}" + local context="${1}" + local namespace="${2}" + local prefix="${3}" - pods=$(get_all_pods "${namespace}") + pods=$(get_all_pods "${context}" "${namespace}") # we only have readiness and automationconfig in mdb pods for pod in ${pods}; do - dump_pod_readiness_state "${pod}" "${namespace}" "${prefix}" - dump_pod_config "${pod}" "${namespace}" "${prefix}" + dump_pod_readiness_state "${context}" "${pod}" "${namespace}" "${prefix}" + dump_pod_config "${context}" "${pod}" "${namespace}" "${prefix}" done # for all pods in the namespace we want to have logs and describe output echo "Iterating over pods to dump logs: ${pods}" for pod in ${pods}; do - kubectl describe "pod/${pod}" -n "${namespace}" > "logs/${prefix}${pod}-pod-describe.txt" - dump_pod_logs "${pod}" "${namespace}" "${prefix}" + kubectl --context="${context}" describe "pod/${pod}" -n "${namespace}" > "logs/${prefix}${pod}-pod-describe.txt" + dump_pod_logs "${context}" "${pod}" "${namespace}" "${prefix}" done - if (kubectl get pod -n "${namespace}" -l app.kubernetes.io/name=controller ) &> /dev/null ; then - operator_pod=$(kubectl get pod -n "${namespace}" -l app.kubernetes.io/component=controller --no-headers -o custom-columns=":metadata.name") + if (kubectl --context="${context}" get pod -n "${namespace}" -l app.kubernetes.io/name=controller ) &> /dev/null ; then + operator_pod=$(kubectl --context="${context}" get pod -n "${namespace}" -l app.kubernetes.io/component=controller --no-headers -o custom-columns=":metadata.name") if [ -n "${operator_pod}" ]; then - kubectl describe "pod/${operator_pod}" -n "${namespace}" > "logs/z_${operator_pod}-pod-describe.txt" - dump_metrics "${namespace}" "${operator_pod}" + kubectl --context="${context}" describe "pod/${operator_pod}" -n "${namespace}" > "logs/${prefix}z_${operator_pod}-pod-describe.txt" + dump_metrics "${context}" "${namespace}" "${operator_pod}" "${prefix}" fi fi @@ -260,53 +307,57 @@ dump_pods() { # high density of information; the main objective of this file is to direct you # to a place where to find your problem, not to tell you what the problem is. dump_diagnostics() { - local namespace="${1}" - - dump_objects mongodb "MongoDB Resources" "${namespace}" - dump_objects mongodbcommunity "MongoDBCommunity Resources" "${namespace}" - dump_objects mongodbusers "MongoDBUser Resources" "${namespace}" - dump_objects opsmanagers "MongoDBOpsManager Resources" "${namespace}" - dump_objects mongodbmulticluster "MongoDB Multi Resources" "${namespace}" - dump_objects mongodbsearch "MongoDB Search Resources" "${namespace}" + local context="${1}" + local namespace="${2}" header "All namespace resources" - kubectl get all -n "${namespace}" + kubectl --context="${context}" get all -n "${namespace}" + + dump_objects "${context}" mongodb "MongoDB Resources" "${namespace}" "get -o yaml" + dump_objects "${context}" mongodbcommunity "MongoDBCommunity Resources" "${namespace}" "get -o yaml" + dump_objects "${context}" mongodbusers "MongoDBUser Resources" "${namespace}" "get -o yaml" + dump_objects "${context}" opsmanagers "MongoDBOpsManager Resources" "${namespace}" "get -o yaml" + dump_objects "${context}" mongodbmulticluster "MongoDB Multi Resources" "${namespace}" "get -o yaml" + dump_objects "${context}" mongodbsearch "MongoDB Search Resources" "${namespace}" "get -o yaml" } download_test_results() { - local namespace="${1}" - local test_pod_name="${2:-e2e-test}" + local context="${1}" + local namespace="${2}" + local test_pod_name="${3:-e2e-test}" echo "Downloading test results from ${test_pod_name} pod" # Try to copy from shared volume using the keepalive container - if kubectl cp "${namespace}/${test_pod_name}:/tmp/results/result.suite" "logs/result.suite" -c keepalive 2>/dev/null; then + if kubectl --context="${context}" cp "${namespace}/${test_pod_name}:/tmp/results/result.suite" "logs/result.suite" -c keepalive 2>/dev/null; then echo "Successfully downloaded result.suite from test pod" else echo "Could not find result.suite via direct copy" # Get logs from the test container - kubectl logs -n "${namespace}" "${test_pod_name}" -c e2e-test > "logs/result.suite" 2>/dev/null + kubectl --context="${context}" logs -n "${namespace}" "${test_pod_name}" -c e2e-test > "logs/result.suite" 2>/dev/null fi } # dump_events gets all events from a namespace and saves them to a file dump_events() { - local namespace="${1}" - local prefix="${2}" + local context="${1}" + local namespace="${2}" + local prefix="${3}" echo "Collecting events for namespace ${namespace}" # Sort by lastTimestamp to have the most recent events at the top - kubectl get events --sort-by='.lastTimestamp' -n "${namespace}" > "logs/${prefix}events.txt" + kubectl --context="${context}" get events --sort-by='.lastTimestamp' -n "${namespace}" > "logs/${prefix}events.txt" # Also get events in yaml format for more details - kubectl get events -n "${namespace}" -o yaml > "logs/${prefix}events_detailed.yaml" + kubectl --context="${context}" get events -n "${namespace}" -o yaml > "logs/${prefix}events_detailed.yaml" } # dump_namespace dumps a namespace, diagnostics, logs and generic Kubernetes # resources. dump_namespace() { - local namespace=${1} - local prefix="${2}" + local context=${1} + local namespace=${2} + local prefix="${3}_${namespace}_" # do not fail for any reason set +e @@ -316,42 +367,42 @@ dump_namespace() { mkdir -p logs # 2. Write diagnostics file - dump_diagnostics "${namespace}" > "logs/${prefix}0_diagnostics.txt" + dump_diagnostics "${context}" "${namespace}" > "logs/${prefix}0_diagnostics.txt" # 3. Print Pod logs - dump_pods "${namespace}" "${prefix}" + dump_pods "${context}" "${namespace}" "${prefix}" # 4. Print other Kubernetes resources - dump_configmaps "${namespace}" "${prefix}" - dump_secrets "${namespace}" "${prefix}" - dump_services "${namespace}" "${prefix}" - dump_events "${namespace}" "${prefix}" + dump_configmaps "${context}" "${namespace}" "${prefix}" + dump_secrets "${context}" "${namespace}" "${prefix}" + dump_services "${context}" "${namespace}" "${prefix}" + dump_events "${context}" "${namespace}" "${prefix}" # Download test results from the test pod in community - download_test_results "${namespace}" "e2e-test" - - dump_objects pvc "Persistent Volume Claims" "${namespace}" > "logs/${prefix}z_persistent_volume_claims.txt" - dump_objects deploy "Deployments" "${namespace}" > "logs/${prefix}z_deployments.txt" - dump_objects deploy "Deployments" "${namespace}" "describe" > "logs/${prefix}z_deployments_describe.txt" - dump_objects sts "StatefulSets" "${namespace}" describe > "logs/${prefix}z_statefulsets.txt" - dump_objects sts "StatefulSets Yaml" "${namespace}" >> "logs/${prefix}z_statefulsets.txt" - dump_objects serviceaccounts "ServiceAccounts" "${namespace}" > "logs/${prefix}z_service_accounts.txt" - dump_objects clusterrolebindings "ClusterRoleBindings" "${namespace}" > "logs/${prefix}z_clusterrolebindings.txt" - dump_objects clusterroles "ClusterRoles" "${namespace}" > "logs/${prefix}z_clusterroles.txt" - dump_objects rolebindings "RoleBindings" "${namespace}" > "logs/${prefix}z_rolebindings.txt" - dump_objects roles "Roles" "${namespace}" > "logs/${prefix}z_roles.txt" - dump_objects validatingwebhookconfigurations "Validating Webhook Configurations" "${namespace}" > "logs/${prefix}z_validatingwebhookconfigurations.txt" - dump_objects certificates.cert-manager.io "Cert-manager certificates" "${namespace}" 2> /dev/null > "logs/${prefix}z_certificates_certmanager.txt" - dump_objects catalogsources "OLM CatalogSources" "${namespace}" 2> /dev/null > "logs/${prefix}z_olm_catalogsources.txt" - dump_objects operatorgroups "OLM OperatorGroups" "${namespace}" 2> /dev/null > "logs/${prefix}z_olm_operatorgroups.txt" - dump_objects subscriptions "OLM Subscriptions" "${namespace}" 2> /dev/null > "logs/${prefix}z_olm_subscriptions.txt" - dump_objects installplans "OLM InstallPlans" "${namespace}" 2> /dev/null > "logs/${prefix}z_olm_installplans.txt" - dump_objects clusterserviceversions "OLM ClusterServiceVersions" "${namespace}" 2> /dev/null > "logs/${prefix}z_olm_clusterserviceversions.txt" - dump_objects pods "Pods" "${namespace}" 2> /dev/null > "logs/${prefix}z_pods.txt" - - kubectl get crd -o name + download_test_results "${context}" "${namespace}" "e2e-test" + + dump_objects "${context}" pvc "Persistent Volume Claims" "${namespace}" "get -o yaml" "logs/${prefix}z_persistent_volume_claims.txt" + dump_objects "${context}" deploy "Deployments" "${namespace}" "get -o yaml" "logs/${prefix}z_deployments.txt" + dump_objects "${context}" deploy "Deployments" "${namespace}" "describe" "logs/${prefix}z_deployments_describe.txt" + dump_objects "${context}" sts "StatefulSets" "${namespace}" "describe" "logs/${prefix}z_statefulsets.txt" + dump_objects "${context}" sts "StatefulSets Yaml" "${namespace}" "get -o yaml" "logs/${prefix}z_statefulsets.txt" + dump_objects "${context}" serviceaccounts "ServiceAccounts" "${namespace}" "get -o yaml" "logs/${prefix}z_service_accounts.txt" + dump_objects "${context}" clusterrolebindings "ClusterRoleBindings" "${namespace}" "get -o yaml" "logs/${prefix}z_clusterrolebindings.txt" + dump_objects "${context}" clusterroles "ClusterRoles" "${namespace}" "get -o yaml" "logs/${prefix}z_clusterroles.txt" + dump_objects "${context}" rolebindings "RoleBindings" "${namespace}" "get -o yaml" "logs/${prefix}z_rolebindings.txt" + dump_objects "${context}" roles "Roles" "${namespace}" "get -o yaml" "logs/${prefix}z_roles.txt" + dump_objects "${context}" validatingwebhookconfigurations "Validating Webhook Configurations" "${namespace}" "get -o yaml" "logs/${prefix}z_validatingwebhookconfigurations.txt" + dump_objects "${context}" certificates.cert-manager.io "Cert-manager certificates" "${namespace}" "get -o yaml" "logs/${prefix}z_certificates_certmanager.txt" 2> /dev/null + dump_objects "${context}" catalogsources "OLM CatalogSources" "${namespace}" "get -o yaml" "logs/${prefix}z_olm_catalogsources.txt" 2> /dev/null + dump_objects "${context}" operatorgroups "OLM OperatorGroups" "${namespace}" "get -o yaml" "logs/${prefix}z_olm_operatorgroups.txt" 2> /dev/null + dump_objects "${context}" subscriptions "OLM Subscriptions" "${namespace}" "get -o yaml" "logs/${prefix}z_olm_subscriptions.txt" 2> /dev/null + dump_objects "${context}" installplans "OLM InstallPlans" "${namespace}" "get -o yaml" "logs/${prefix}z_olm_installplans.txt" 2> /dev/null + dump_objects "${context}" clusterserviceversions "OLM ClusterServiceVersions" "${namespace}" "get -o yaml" "logs/${prefix}z_olm_clusterserviceversions.txt" 2> /dev/null + dump_objects "${context}" pods "Pods" "${namespace}" "get -o yaml" "logs/${prefix}z_pods.txt" 2> /dev/null + + kubectl --context="${context}" get crd -o name # shellcheck disable=SC2046 - kubectl describe $(kubectl get crd -o name | grep mongodb) > "logs/${prefix}z_mongodb_crds.log" + kubectl --context="${context}" describe $(kubectl --context="${context}" get crd -o name | grep mongodb) > "logs/${prefix}z_mongodb_crds.log" - kubectl describe nodes > "logs/${prefix}z_nodes_detailed.log" || true + kubectl --context="${context}" describe nodes > "logs/${prefix}z_nodes_detailed.log" || true } diff --git a/scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh b/scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh index 72571a811..59a41f19f 100755 --- a/scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh +++ b/scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh @@ -7,4 +7,9 @@ set +e source scripts/funcs/printing source scripts/evergreen/e2e/dump_diagnostic_information.sh -dump_all_non_default_namespaces "$@" +# If no context provided, use current context +if [ $# -eq 0 ]; then + dump_all_non_default_namespaces "$(kubectl config current-context)" +else + dump_all_non_default_namespaces "$@" +fi diff --git a/scripts/evergreen/e2e/e2e.sh b/scripts/evergreen/e2e/e2e.sh index 9d6e8de83..e1e6ed556 100755 --- a/scripts/evergreen/e2e/e2e.sh +++ b/scripts/evergreen/e2e/e2e.sh @@ -42,7 +42,7 @@ dump_cluster_information() { done else # Dump all the information we can from this namespace - dump_all || true + dump_all "$(kubectl config current-context)" || true fi } diff --git a/scripts/funcs/operator_deployment b/scripts/funcs/operator_deployment index f13b31f23..d8c7a5ed3 100644 --- a/scripts/funcs/operator_deployment +++ b/scripts/funcs/operator_deployment @@ -34,6 +34,9 @@ get_operator_helm_values() { "operator.telemetry.send.enabled=${MDB_OPERATOR_TELEMETRY_SEND_ENABLED:-false}" # lets collect and save in the configmap as frequently as we can "operator.telemetry.collection.frequency=${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}" + "search.community.repo=${MDB_SEARCH_COMMUNITY_REPO_URL}" + "search.community.name=${MDB_SEARCH_COMMUNITY_NAME}" + "search.community.version=${MDB_SEARCH_COMMUNITY_VERSION}" "community.registry.agent=${AGENT_BASE_REGISTRY:-${REGISTRY}}" ) @@ -67,9 +70,11 @@ get_operator_helm_values() { # shellcheck disable=SC2154 if [[ "${KUBE_ENVIRONMENT_NAME-}" = "multi" ]]; then - comma_separated_list="$(echo "${MEMBER_CLUSTERS}" | tr ' ' ',')" - # shellcheck disable=SC2154 - config+=("multiCluster.clusters={${comma_separated_list}}") + if [[ -n "${MEMBER_CLUSTERS:-}" ]]; then + comma_separated_list="$(echo "${MEMBER_CLUSTERS}" | tr ' ' ',')" + # shellcheck disable=SC2154 + config+=("multiCluster.clusters={${comma_separated_list}}") + fi config+=("operator.createOperatorServiceAccount=false") fi