Skip to content

[release-1.26] Annotate only our clusters when using kind #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 1 commit into from
Jul 4, 2025
Merged

[release-1.26] Annotate only our clusters when using kind #977

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions tests/e2e/setup/setup-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export IP_FAMILY="${IP_FAMILY:-ipv4}"
export KIND_IP_FAMILY="${IP_FAMILY}"
export ARTIFACTS="${ARTIFACTS:-$(mktemp -d)}"
export MULTICLUSTER="${MULTICLUSTER:-false}"
export KIND_EXCLUDE_CLUSTERS="${KIND_EXCLUDE_CLUSTERS:-}"

export KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-operator-integration-tests}"
if [ "${MULTICLUSTER}" == "true" ]; then
Expand All @@ -48,11 +47,7 @@ function setup_kind_registry() {
docker network connect "kind" "${KIND_REGISTRY_NAME}"
fi

for cluster in $(kind get clusters); do
if [[ "${KIND_EXCLUDE_CLUSTERS}" == *"${cluster}"* ]]; then
continue
fi

for cluster in "$@"; do
if [ "${MULTICLUSTER}" == "true" ]; then
export KUBECONFIG="${KUBECONFIG_DIR}/${cluster}"
else
Expand All @@ -70,13 +65,13 @@ if [ "${MULTICLUSTER}" == "true" ]; then
CLUSTER_TOPOLOGY_CONFIG_FILE="${SCRIPTPATH}/../setup/config/multicluster.json"
load_cluster_topology "${CLUSTER_TOPOLOGY_CONFIG_FILE}"
setup_kind_clusters "" ""
setup_kind_registry
setup_kind_registry "${CLUSTER_NAMES[@]}"

export KUBECONFIG="${KUBECONFIGS[0]}"
export KUBECONFIG2="${KUBECONFIGS[1]}"
echo "Your KinD environment is ready, to use it: export KUBECONFIG=$(IFS=:; echo "${KUBECONFIGS[*]}")"
else
KUBECONFIG="${ARTIFACTS}/config" setup_kind_cluster "${KIND_CLUSTER_NAME}" "" "" "true" "true"
setup_kind_registry
setup_kind_registry "$KIND_CLUSTER_NAME"
echo "Your KinD environment is ready, to use it: export KUBECONFIG=${ARTIFACTS}/config"
fi