Skip to content

Commit

Permalink
Automator: update common-files@master in istio/istio.io@master (#11363)
Browse files Browse the repository at this point in the history
  • Loading branch information
istio-testing authored Jun 1, 2022
1 parent 186c8a2 commit d5a6dbe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3756ac98d77a5f37e6debd045d1fd9458dae6e5d
05c7e093af5d168b237cc3a7efc86e3f5b06e3da
11 changes: 5 additions & 6 deletions common/scripts/kind_provisioner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ function setup_kind_cluster() {
IMAGE="${2:-"${DEFAULT_KIND_IMAGE}"}"
CONFIG="${3:-}"
NOMETALBINSTALL="${4:-}"
CLEANUP="${5:-true}"

check_default_cluster_yaml

Expand All @@ -163,7 +164,9 @@ function setup_kind_cluster() {

# explicitly disable shellcheck since we actually want $NAME to expand now
# shellcheck disable=SC2064
trap "cleanup_kind_cluster ${NAME}" EXIT
if [[ "${CLEANUP}" == "true" ]]; then
trap "cleanup_kind_cluster ${NAME}" EXIT
fi

# If config not explicitly set, then use defaults
if [[ -z "${CONFIG}" ]]; then
Expand Down Expand Up @@ -222,10 +225,6 @@ EOF
echo "${fixed_coredns}"
printf '%s' "${fixed_coredns}" | kubectl apply -f -
fi

# On Ubuntu Jammy, the trap runs when this function exits. Remove trap to prevent
# cluster shutdown here.
trap EXIT
}

###############################################################################
Expand Down Expand Up @@ -277,7 +276,7 @@ EOF
CLUSTER_KUBECONFIG="${KUBECONFIG_DIR}/${CLUSTER_NAME}"

# Create the clusters.
KUBECONFIG="${CLUSTER_KUBECONFIG}" setup_kind_cluster "${CLUSTER_NAME}" "${IMAGE}" "${CLUSTER_YAML}" "true"
KUBECONFIG="${CLUSTER_KUBECONFIG}" setup_kind_cluster "${CLUSTER_NAME}" "${IMAGE}" "${CLUSTER_YAML}" "true" "false"

# Kind currently supports getting a kubeconfig for internal or external usage. To simplify our tests,
# its much simpler if we have a single kubeconfig that can be used internally and externally.
Expand Down

0 comments on commit d5a6dbe

Please sign in to comment.