Automator: update common-files@master in istio/istio.io@master (#14032)

This commit is contained in:
Istio Automation 2023-10-19 16:13:44 -07:00 committed by GitHub
parent 6c837c3b64
commit 12f8e3f917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -1 +1 @@
c6d1aaa9f294ab30157f809debf4644d0d7494a9
fb35ce5ba04f33a86193646286f201c06d1368aa

View File

@ -130,7 +130,7 @@ function cleanup_kind_cluster() {
# check_default_cluster_yaml checks the presence of default cluster YAML
# It returns 1 if it is not present
function check_default_cluster_yaml() {
if [[ -z "${DEFAULT_CLUSTER_YAML}" ]]; then
if [[ -z "${DEFAULT_CLUSTER_YAML:-}" ]]; then
echo 'DEFAULT_CLUSTER_YAML file must be specified. Exiting...'
return 1
fi
@ -148,11 +148,11 @@ function setup_kind_cluster_retry() {
# This function returns 0 when everything goes well, or 1 otherwise
# 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:-"${DEFAULT_KIND_IMAGE}"}"
CONFIG="${3:-}"
NOMETALBINSTALL="${4:-}"
CLEANUP="${5:-true}"
local NAME="${1:-istio-testing}"
local IMAGE="${2:-"${DEFAULT_KIND_IMAGE}"}"
local CONFIG="${3:-}"
local NOMETALBINSTALL="${4:-}"
local CLEANUP="${5:-true}"
check_default_cluster_yaml
@ -192,7 +192,7 @@ EOF
# If metrics server configuration directory is specified then deploy in
# the cluster just created
if [[ -n ${METRICS_SERVER_CONFIG_DIR} ]]; then
if [[ -n ${METRICS_SERVER_CONFIG_DIR:-} ]]; then
retry kubectl apply -f "${METRICS_SERVER_CONFIG_DIR}"
fi