diff --git a/cluster/common.sh b/cluster/common.sh index 0ae153209f9..dd6775c8d40 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -221,7 +221,7 @@ function get-kubeconfig-user-basicauth() { # KUBE_PASSWORD function gen-kube-basicauth() { KUBE_USER='admin' - KUBE_PASSWORD=$(python -c 'import string,random; print("".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16)))') + KUBE_PASSWORD=$(python3 -c 'import string,random; print("".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16)))') } # Get the bearer token for the current-context in kubeconfig if one exists. diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 50b59be9c3a..1e9fb7ecbb2 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -28,6 +28,9 @@ set -o pipefail ### Hardcoded constants METADATA_SERVER_IP="${METADATA_SERVER_IP:-169.254.169.254}" +# Standard curl flags. +CURL_FLAGS='--fail --silent --show-error --retry 5 --retry-delay 3 --connect-timeout 10 --retry-connrefused' + function convert-manifest-params { # A helper function to convert the manifest args from a string to a list of # flag arguments. @@ -2278,14 +2281,10 @@ function download-extra-addons { mkdir -p "${out_dir}" + # shellcheck disable=SC2206 local curl_cmd=( "curl" - "--fail" - "--retry" "5" - "--retry-delay" "3" - "--silent" - "--show-error" - "--retry-connrefused" + ${CURL_FLAGS} ) if [[ -n "${EXTRA_ADDONS_HEADER:-}" ]]; then curl_cmd+=("-H" "${EXTRA_ADDONS_HEADER}") @@ -2307,14 +2306,10 @@ function get-metadata-value { local default="${2:-}" local status - curl \ - --retry 5 \ - --retry-delay 3 \ - --retry-connrefused \ - --fail \ - --silent \ - -H 'Metadata-Flavor: Google' \ - "http://metadata/computeMetadata/v1/${1}" \ + # shellcheck disable=SC2086 + curl ${CURL_FLAGS} \ + -H 'Metadata-Flavor: Google' \ + "http://metadata/computeMetadata/v1/${1}" \ || status="$?" status="${status:-0}" @@ -3158,7 +3153,7 @@ function log-trap-pop { function log-error { local bootstep="$1" - log-proto "${bootstep}" "${LOG_STATUS_ERROR}" "error calling '${BASH_COMMAND}'" + log-proto "${bootstep}" "${LOG_STATUS_ERROR}" "encountered non-zero exit code" } # Wraps a command with bootstrap logging. diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 83ed3abca50..56b7d2f2120 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -33,6 +33,9 @@ DEFAULT_CRICTL_HASH='e4fb9822cb5f71ab8f85021c66170613aae972f4b32030e42868fb36a3b DEFAULT_MOUNTER_TAR_SHA='7956fd42523de6b3107ddc3ce0e75233d2fcb78436ff07a1389b6eaac91fb2b1b72a08f7a219eaf96ba1ca4da8d45271002e0d60e0644e796c665f99bb356516' ### +# Standard curl flags. +CURL_FLAGS='--fail --silent --show-error --retry 5 --retry-delay 3 --connect-timeout 10 --retry-connrefused' + function set-broken-motd { cat > /etc/motd <