Skip to content

Commit d64c269

Browse files
Automator: update common-files@master in istio/api@master (#2968)
1 parent 990fa62 commit d64c269

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c6d1aaa9f294ab30157f809debf4644d0d7494a9
1+
fb35ce5ba04f33a86193646286f201c06d1368aa

common/scripts/kind_provisioner.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function cleanup_kind_cluster() {
130130
# check_default_cluster_yaml checks the presence of default cluster YAML
131131
# It returns 1 if it is not present
132132
function check_default_cluster_yaml() {
133-
if [[ -z "${DEFAULT_CLUSTER_YAML}" ]]; then
133+
if [[ -z "${DEFAULT_CLUSTER_YAML:-}" ]]; then
134134
echo 'DEFAULT_CLUSTER_YAML file must be specified. Exiting...'
135135
return 1
136136
fi
@@ -148,11 +148,11 @@ function setup_kind_cluster_retry() {
148148
# This function returns 0 when everything goes well, or 1 otherwise
149149
# If Kind cluster was already created then it would be cleaned up in case of errors
150150
function setup_kind_cluster() {
151-
NAME="${1:-istio-testing}"
152-
IMAGE="${2:-"${DEFAULT_KIND_IMAGE}"}"
153-
CONFIG="${3:-}"
154-
NOMETALBINSTALL="${4:-}"
155-
CLEANUP="${5:-true}"
151+
local NAME="${1:-istio-testing}"
152+
local IMAGE="${2:-"${DEFAULT_KIND_IMAGE}"}"
153+
local CONFIG="${3:-}"
154+
local NOMETALBINSTALL="${4:-}"
155+
local CLEANUP="${5:-true}"
156156

157157
check_default_cluster_yaml
158158

@@ -192,7 +192,7 @@ EOF
192192

193193
# If metrics server configuration directory is specified then deploy in
194194
# the cluster just created
195-
if [[ -n ${METRICS_SERVER_CONFIG_DIR} ]]; then
195+
if [[ -n ${METRICS_SERVER_CONFIG_DIR:-} ]]; then
196196
retry kubectl apply -f "${METRICS_SERVER_CONFIG_DIR}"
197197
fi
198198

0 commit comments

Comments
 (0)