From ddfb3bb2e41aaa25cf3c1a67f9ead9abcec70c40 Mon Sep 17 00:00:00 2001
From: Istio Automation <istio-testing-bot@google.com>
Date: Thu, 19 Nov 2020 11:14:49 -0800
Subject: [PATCH] Automator: update common-files@master in
 istio/istio.io@master (#8530)

---
 common/.commonfiles.sha            | 2 +-
 common/scripts/kind_provisioner.sh | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 9d0ad58522..06eba1be8c 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-a321892c6cec32b20328e881f3225029c3d101eb
+6ed0f9f27778fa28f005095f57f90df4a1a8909a
diff --git a/common/scripts/kind_provisioner.sh b/common/scripts/kind_provisioner.sh
index 278207bee7..9db24db629 100644
--- a/common/scripts/kind_provisioner.sh
+++ b/common/scripts/kind_provisioner.sh
@@ -31,6 +31,9 @@ set -x
 #################   COMMON SECTION   ###############################
 ####################################################################
 
+# DEFAULT_KIND_IMAGE is used to set the Kubernetes version for KinD unless overridden in params to setup_kind_cluster(s)
+DEFAULT_KIND_IMAGE="gcr.io/istio-testing/kindest/node:v1.19.1"
+
 # load_cluster_topology function reads cluster configuration topology file and
 # sets up environment variables used by other functions. So this should be called
 # before anything else.
@@ -116,7 +119,7 @@ function check_default_cluster_yaml() {
 # If Kind cluster was already created then it would be cleaned up in case of errors
 function setup_kind_cluster() {
   NAME="${1:-istio-testing}"
-  IMAGE="${2:-gcr.io/istio-testing/kindest/node:v1.19.1}"
+  IMAGE="${2:-"${DEFAULT_KIND_IMAGE}"}"
   CONFIG="${3:-}"
   NOMETALBINSTALL="${4:-}"
 
@@ -185,7 +188,7 @@ function cleanup_kind_clusters() {
 # NOTE: Please call load_cluster_topology before calling this method as it expects
 # cluster topology information to be loaded in advance
 function setup_kind_clusters() {
-  IMAGE="${1:-gcr.io/istio-testing/kindest/node:v1.19.1}"
+  IMAGE="${1:-"${DEFAULT_KIND_IMAGE}"}"
   KUBECONFIG_DIR="$(mktemp -d)"
   IP_FAMILY="${2:-ipv4}"