diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 6e66cd73e08..46cd1fef848 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -19,6 +19,8 @@ # gce/util.sh script which assumes config filename), but if some things that # are enabled by default should not run in hollow clusters, they should be disabled here. +# shellcheck disable=SC2034 # Variables sourced in other scripts. + source "${KUBE_ROOT}/cluster/gce/config-common.sh" GCLOUD=gcloud @@ -115,7 +117,7 @@ ENABLE_KUBEMARK_CLUSTER_AUTOSCALER="${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER:-false} # (e.g. kubemark master, Heapster) enough resources to handle maximum cluster size. if [[ "${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER}" == "true" ]]; then NUM_REPLICAS=1 - if [[ ! -z "$NUM_NODES" ]]; then + if [[ -n "$NUM_NODES" ]]; then echo "WARNING: Using Cluster Autoscaler, ignoring NUM_NODES parameter. Set KUBEMARK_AUTOSCALER_MAX_NODES to specify maximum size of the cluster." fi fi diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index d805a941c33..f66781abb49 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -19,7 +19,6 @@ ./cluster/gce/upgrade.sh ./cluster/gce/util.sh ./cluster/images/conformance/run_e2e.sh -./cluster/kubemark/gce/config-default.sh ./cluster/kubemark/iks/config-default.sh ./cluster/kubemark/util.sh ./cluster/log-dump/log-dump.sh