wip

Author: lsierant

scripts/code_snippets/tests/test_gke_multi_cluster_snippets.sh

@@ -26,8 +26,26 @@ function cleanup() {
   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() {
-  scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh
+  dump_logs
   cleanup
 }
 

scripts/code_snippets/tests/test_kind_search_community_snippets.sh

@@ -14,7 +14,12 @@ mkdir -p "${_SNIPPETS_OUTPUT_DIR}"
 dump_logs() {
   source scripts/evergreen/e2e/dump_diagnostic_information.sh
   if [[ "${SKIP_DUMP:-"false"}" != "true" ]]; then
-    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
   echo
   fi
 }

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
@@ -19,3 +19,4 @@ export EVG_HOST_NAME=""
 # ENV_VARIABLES.SH overrides
 export OPERATOR_ADDITIONAL_HELM_VALUES=""
 export OPERATOR_HELM_CHART=${PROJECT_DIR}/helm_chart
+

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=""
@@ -21,3 +23,5 @@ source scripts/funcs/operator_deployment
 OPERATOR_ADDITIONAL_HELM_VALUES="$(get_operator_helm_values | tr ' ' ','),customEnvVars=OM_DEBUG_HTTP=true"
 export OPERATOR_ADDITIONAL_HELM_VALUES
 export OPERATOR_HELM_CHART="${PROJECT_DIR}/helm_chart"
+
+export CLUSTER_NAME="${K8S_CONTEXT_0_CONTEXT_NAME}"

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=""

scripts/evergreen/e2e/dump_diagnostic_information.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

scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.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
 }
 

scripts/evergreen/e2e/e2e.sh

@@ -69,9 +69,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