Merge pull request kubernetes#73085 from rlenferink/patch-2

Improving syntax for bash scripts

Author: k8s-ci-robot

hack/gen-swagger-doc/gen-swagger-docs.sh

@@ -35,7 +35,7 @@ top_level_models=$(grep '&[A-Za-z]*{},' /register.go | sed 's/.*&//;s/{},//')
 # check if the top level models exist in the definitions.adoc. If they exist,
 # their name will be <version>.<model_name>
 VERSION="${1#*_}"
-for m in $top_level_models
+for m in ${top_level_models}
 do
   if grep -xq "=== ${VERSION}.$m" ./definitions.adoc
   then

hack/ginkgo-e2e.sh

@@ -87,7 +87,7 @@ if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
   set_num_migs
   NODE_INSTANCE_GROUP=""
   for ((i=1; i<=${NUM_MIGS}; i++)); do
-    if [[ $i == ${NUM_MIGS} ]]; then
+    if [[ ${i} == ${NUM_MIGS} ]]; then
       # We are assigning the same mig names as create-nodes function from cluster/gce/util.sh.
       NODE_INSTANCE_GROUP="${NODE_INSTANCE_GROUP}${NODE_INSTANCE_PREFIX}-group"
     else

hack/jenkins/benchmark-dockerized.sh

@@ -21,7 +21,7 @@ set -o xtrace
 
 retry() {
   for i in {1..5}; do
-    "$@" && return 0 || sleep $i
+    "$@" && return 0 || sleep "${i}"
   done
   "$@"
 }

hack/jenkins/test-dockerized.sh

@@ -21,7 +21,7 @@ set -o xtrace
 
 retry() {
   for i in {1..5}; do
-    "$@" && return 0 || sleep $i
+    "$@" && return 0 || sleep "${i}"
   done
   "$@"
 }

hack/lib/etcd.sh

@@ -47,12 +47,12 @@ kube::etcd::validate() {
 
   # validate installed version is at least equal to minimum
   version=$(etcd --version | tail -n +1 | head -n 1 | cut -d " " -f 3)
-  if [[ $(kube::etcd::version $ETCD_VERSION) -gt $(kube::etcd::version $version) ]]; then
-   export PATH=$KUBE_ROOT/third_party/etcd:$PATH
+  if [[ $(kube::etcd::version ${ETCD_VERSION}) -gt $(kube::etcd::version ${version}) ]]; then
+   export PATH=${KUBE_ROOT}/third_party/etcd:$PATH
    hash etcd
    echo $PATH
    version=$(etcd --version | head -n 1 | cut -d " " -f 3)
-   if [[ $(kube::etcd::version $ETCD_VERSION) -gt $(kube::etcd::version $version) ]]; then
+   if [[ $(kube::etcd::version ${ETCD_VERSION}) -gt $(kube::etcd::version ${version}) ]]; then
     kube::log::usage "etcd version ${ETCD_VERSION} or greater required."
     kube::log::info "You can use 'hack/install-etcd.sh' to install a copy in third_party/."
     exit 1

hack/lib/golang.sh

@@ -594,11 +594,11 @@ kube::golang::build_binaries_for_platform() {
 
   for binary in "${binaries[@]}"; do
     if [[ "${binary}" =~ ".test"$ ]]; then
-      tests+=($binary)
+      tests+=(${binary})
     elif kube::golang::is_statically_linked_library "${binary}"; then
-      statics+=($binary)
+      statics+=(${binary})
     else
-      nonstatics+=($binary)
+      nonstatics+=(${binary})
     fi
   done
 

hack/lib/logging.sh

@@ -57,10 +57,10 @@ kube::log::install_errexit() {
 kube::log::stack() {
   local stack_skip=${1:-0}
   stack_skip=$((stack_skip + 1))
-  if [[ ${#FUNCNAME[@]} -gt $stack_skip ]]; then
+  if [[ ${#FUNCNAME[@]} -gt ${stack_skip} ]]; then
     echo "Call stack:" >&2
     local i
-    for ((i=1 ; i <= ${#FUNCNAME[@]} - $stack_skip ; i++))
+    for ((i=1 ; i <= ${#FUNCNAME[@]} - ${stack_skip} ; i++))
     do
       local frame_no=$((i - 1 + stack_skip))
       local source_file=${BASH_SOURCE[$frame_no]}
@@ -90,7 +90,7 @@ kube::log::error_exit() {
       echo "  ${1}" >&2
     }
 
-    kube::log::stack $stack_skip
+    kube::log::stack ${stack_skip}
 
     echo "Exiting with status ${code}" >&2
   fi
@@ -130,7 +130,7 @@ kube::log::usage_from_stdin() {
 # Print out some info that isn't a top level status line
 kube::log::info() {
   local V="${V:-0}"
-  if [[ $KUBE_VERBOSE < $V ]]; then
+  if [[ ${KUBE_VERBOSE} < ${V} ]]; then
     return
   fi
 
@@ -158,7 +158,7 @@ kube::log::info_from_stdin() {
 # Print a status line.  Formatted to show up in a stream of output.
 kube::log::status() {
   local V="${V:-0}"
-  if [[ $KUBE_VERBOSE < $V ]]; then
+  if [[ ${KUBE_VERBOSE} < ${V} ]]; then
     return
   fi
 

hack/lib/protoc.sh

@@ -83,7 +83,7 @@ function kube::protoc::format() {
 function kube::protoc::diff() {
   local ret=0
   diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr ${1} ${2} || ret=$?
-  if [[ $ret -ne 0 ]]; then
+  if [[ ${ret} -ne 0 ]]; then
     echo ${3}
     exit 1
   fi

hack/local-up-cluster.sh

@@ -129,7 +129,7 @@ fi
 
 # set feature gates if enable Pod priority and preemption
 if [ "${ENABLE_POD_PRIORITY_PREEMPTION}" == true ]; then
-    FEATURE_GATES="$FEATURE_GATES,PodPriority=true"
+    FEATURE_GATES="${FEATURE_GATES},PodPriority=true"
 fi
 
 # warn if users are running with swap allowed
@@ -169,15 +169,15 @@ function guess_built_binary_path {
 GO_OUT=${GO_OUT:-}
 while getopts "ho:O" OPTION
 do
-    case $OPTION in
+    case ${OPTION} in
         o)
             echo "skipping build"
-            GO_OUT="$OPTARG"
-            echo "using source $GO_OUT"
+            GO_OUT="${OPTARG}"
+            echo "using source ${GO_OUT}"
             ;;
         O)
             GO_OUT=$(guess_built_binary_path)
-            if [ "$GO_OUT" == "" ]; then
+            if [ "${GO_OUT}" == "" ]; then
                 echo "Could not guess the correct output directory to use."
                 exit 1
             fi
@@ -193,7 +193,7 @@ do
     esac
 done
 
-if [ "x$GO_OUT" == "x" ]; then
+if [ "x${GO_OUT}" == "x" ]; then
     make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube"
 else
     echo "skipped the build."
@@ -263,20 +263,20 @@ function test_apiserver_off {
     # For the common local scenario, fail fast if server is already running.
     # this can happen if you run local-up-cluster.sh twice and kill etcd in between.
     if [[ "${API_PORT}" -gt "0" ]]; then
-        curl --silent -g $API_HOST:$API_PORT
+        curl --silent -g ${API_HOST}:${API_PORT}
         if [ ! $? -eq 0 ]; then
             echo "API SERVER insecure port is free, proceeding..."
         else
-            echo "ERROR starting API SERVER, exiting. Some process on $API_HOST is serving already on $API_PORT"
+            echo "ERROR starting API SERVER, exiting. Some process on ${API_HOST} is serving already on ${API_PORT}"
             exit 1
         fi
     fi
 
-    curl --silent -k -g $API_HOST:$API_SECURE_PORT
+    curl --silent -k -g ${API_HOST}:${API_SECURE_PORT}
     if [ ! $? -eq 0 ]; then
         echo "API SERVER secure port is free, proceeding..."
     else
-        echo "ERROR starting API SERVER, exiting. Some process on $API_HOST is serving already on $API_SECURE_PORT"
+        echo "ERROR starting API SERVER, exiting. Some process on ${API_HOST} is serving already on ${API_SECURE_PORT}"
         exit 1
     fi
 }
@@ -335,9 +335,9 @@ function detect_binary {
 
 cleanup_dockerized_kubelet()
 {
-  if [[ -e $KUBELET_CIDFILE ]]; then
-    docker kill $(<$KUBELET_CIDFILE) > /dev/null
-    rm -f $KUBELET_CIDFILE
+  if [[ -e ${KUBELET_CIDFILE} ]]; then
+    docker kill $(<${KUBELET_CIDFILE}) > /dev/null
+    rm -f ${KUBELET_CIDFILE}
 
     # Save the docker logs
     if [[ -f /var/log/docker.log ]]; then
@@ -367,7 +367,7 @@ cleanup()
   [[ -n "${CTLRMGR_PID-}" ]] && CTLRMGR_PIDS=$(pgrep -P ${CTLRMGR_PID} ; ps -o pid= -p ${CTLRMGR_PID})
   [[ -n "${CTLRMGR_PIDS-}" ]] && sudo kill ${CTLRMGR_PIDS} 2>/dev/null
 
-  if [[ -n "$DOCKERIZE_KUBELET" ]]; then
+  if [[ -n "${DOCKERIZE_KUBELET}" ]]; then
     cleanup_dockerized_kubelet
   else
     # Check if the kubelet is still running
@@ -404,7 +404,7 @@ function healthcheck {
     CTLRMGR_PID=
   fi
 
-  if [[ -n "$DOCKERIZE_KUBELET" ]]; then
+  if [[ -n "${DOCKERIZE_KUBELET}" ]]; then
     # TODO (https://github.com/kubernetes/kubernetes/issues/62474): check health also in this case
     :
   elif [[ -n "${KUBELET_PID-}" ]] && ! sudo kill -0 ${KUBELET_PID} 2>/dev/null; then
@@ -648,11 +648,11 @@ function start_controller_manager {
       --pvclaimbinder-sync-period="${CLAIM_BINDER_SYNC_PERIOD}" \
       --feature-gates="${FEATURE_GATES}" \
       ${cloud_config_arg} \
-      --kubeconfig "$CERT_DIR"/controller.kubeconfig \
+      --kubeconfig "${CERT_DIR}"/controller.kubeconfig \
       --use-service-account-credentials \
       --controllers="${KUBE_CONTROLLERS}" \
       --leader-elect=false \
-      --cert-dir="$CERT_DIR" \
+      --cert-dir="${CERT_DIR}" \
       --master="https://${API_HOST}:${API_SECURE_PORT}" >"${CTLRMGR_LOG}" 2>&1 &
     CTLRMGR_PID=$!
 }
@@ -680,7 +680,7 @@ function start_cloud_controller_manager {
       --feature-gates="${FEATURE_GATES}" \
       --cloud-provider=${CLOUD_PROVIDER} \
       --cloud-config=${CLOUD_CONFIG} \
-      --kubeconfig "$CERT_DIR"/controller.kubeconfig \
+      --kubeconfig "${CERT_DIR}"/controller.kubeconfig \
       --use-service-account-credentials \
       --leader-elect=false \
       --master="https://${API_HOST}:${API_SECURE_PORT}" >"${CLOUD_CTLRMGR_LOG}" 2>&1 &
@@ -763,7 +763,7 @@ function start_kubelet {
       --hostname-override="${HOSTNAME_OVERRIDE}"
       ${cloud_config_arg}
       --address="${KUBELET_HOST}"
-      --kubeconfig "$CERT_DIR"/kubelet.kubeconfig
+      --kubeconfig "${CERT_DIR}"/kubelet.kubeconfig
       --feature-gates="${FEATURE_GATES}"
       --cpu-cfs-quota="${CPU_CFS_QUOTA}"
       --enable-controller-attach-detach="${ENABLE_CONTROLLER_ATTACH_DETACH}"
@@ -782,7 +782,7 @@ function start_kubelet {
       ${net_plugin_args}
       ${container_runtime_endpoint_args}
       ${image_service_endpoint_args}
-      --port="$KUBELET_PORT"
+      --port="${KUBELET_PORT}"
       ${KUBELET_FLAGS}
     )
 
@@ -792,7 +792,7 @@ function start_kubelet {
     else
 
       # Build the hyperkube container image if necessary
-      if [[ -z "$KUBELET_IMAGE" && -n "$DOCKERIZE_KUBELET" ]]; then
+      if [[ -z "${KUBELET_IMAGE}" && -n "${DOCKERIZE_KUBELET}" ]]; then
         HYPERKUBE_BIN="${GO_OUT}/hyperkube" REGISTRY="k8s.gcr.io" VERSION="latest" make -C "${KUBE_ROOT}/cluster/images/hyperkube" build
         KUBELET_IMAGE="k8s.gcr.io/hyperkube-amd64:latest"
       fi
@@ -841,15 +841,15 @@ function start_kubelet {
         --pid=host \
         --privileged=true \
         -i \
-        --cidfile=$KUBELET_CIDFILE \
+        --cidfile=${KUBELET_CIDFILE} \
         "${KUBELET_IMAGE}" \
         /kubelet "${all_kubelet_flags[@]}" >"${KUBELET_LOG}" 2>&1 &
       # Get PID of kubelet container.
       for i in {1..3}; do
         echo -n "Trying to get PID of kubelet container..."
         KUBELET_PID=$(docker inspect kubelet -f '{{.State.Pid}}' 2>/dev/null || true)
         if [[ -n ${KUBELET_PID} && ${KUBELET_PID} -gt 0 ]]; then
-            echo " ok, $KUBELET_PID."
+            echo " ok, ${KUBELET_PID}."
             break
         else
             echo " failed, retry in 1 second."
@@ -858,8 +858,8 @@ function start_kubelet {
       done
     fi
     # Quick check that kubelet is running.
-    if [ -n "$KUBELET_PID" ] && ps -p $KUBELET_PID > /dev/null; then
-      echo "kubelet ( $KUBELET_PID ) is running."
+    if [ -n "${KUBELET_PID}" ] && ps -p ${KUBELET_PID} > /dev/null; then
+      echo "kubelet ( ${KUBELET_PID} ) is running."
     else
       cat ${KUBELET_LOG} ; exit 1
     fi
@@ -882,7 +882,7 @@ EOF
       #   foo: true
       #   bar: false
       for gate in $(echo ${FEATURE_GATES} | tr ',' ' '); do
-        echo $gate | ${SED} -e 's/\(.*\)=\(.*\)/  \1: \2/'
+        echo ${gate} | ${SED} -e 's/\(.*\)=\(.*\)/  \1: \2/'
       done
     fi >>/tmp/kube-proxy.yaml
 
@@ -896,7 +896,7 @@ EOF
     ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" scheduler \
       --v=${LOG_LEVEL} \
       --leader-elect=false \
-      --kubeconfig "$CERT_DIR"/scheduler.kubeconfig \
+      --kubeconfig "${CERT_DIR}"/scheduler.kubeconfig \
       --feature-gates="${FEATURE_GATES}" \
       --master="https://${API_HOST}:${API_SECURE_PORT}" >"${SCHEDULER_LOG}" 2>&1 &
     SCHEDULER_PID=$!
@@ -947,17 +947,17 @@ function create_psp_policy {
 }
 
 function create_storage_class {
-    if [ -z "$CLOUD_PROVIDER" ]; then
+    if [ -z "${CLOUD_PROVIDER}" ]; then
         CLASS_FILE=${KUBE_ROOT}/cluster/addons/storage-class/local/default.yaml
     else
         CLASS_FILE=${KUBE_ROOT}/cluster/addons/storage-class/${CLOUD_PROVIDER}/default.yaml
     fi
 
-    if [ -e $CLASS_FILE ]; then
-        echo "Create default storage class for $CLOUD_PROVIDER"
-        ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create -f $CLASS_FILE
+    if [ -e ${CLASS_FILE} ]; then
+        echo "Create default storage class for ${CLOUD_PROVIDER}"
+        ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create -f ${CLASS_FILE}
     else
-        echo "No storage class available for $CLOUD_PROVIDER."
+        echo "No storage class available for ${CLOUD_PROVIDER}."
     fi
 }
 
@@ -1053,11 +1053,11 @@ kube::util::test_openssl_installed
 kube::util::ensure-cfssl
 
 ### IF the user didn't supply an output/ for the build... Then we detect.
-if [ "$GO_OUT" == "" ]; then
+if [ "${GO_OUT}" == "" ]; then
   detect_binary
 fi
 echo "Detected host and ready to start services.  Doing some housekeeping first..."
-echo "Using GO_OUT $GO_OUT"
+echo "Using GO_OUT ${GO_OUT}"
 KUBELET_CIDFILE=/tmp/kubelet.cid
 if [[ "${ENABLE_DAEMON}" = false ]]; then
   trap cleanup EXIT
@@ -1101,7 +1101,7 @@ if [[ -n "${PSP_ADMISSION}" && "${AUTHORIZATION_MODE}" = *RBAC* ]]; then
   create_psp_policy
 fi
 
-if [[ "$DEFAULT_STORAGE_CLASS" = "true" ]]; then
+if [[ "${DEFAULT_STORAGE_CLASS}" = "true" ]]; then
   create_storage_class
 fi
 

hack/make-rules/make-help.sh

@@ -28,15 +28,15 @@ CMD_FLAG=false
 PLUGIN_CMD_FLAG=false
 
 echo "--------------------------------------------------------------------------------"
-for tar in $ALL_TARGETS; do
-	for cmdtar in $CMD_TARGETS; do
-		if [ $tar = $cmdtar ]; then
-			if [ $CMD_FLAG = true ]; then
+for tar in ${ALL_TARGETS}; do
+	for cmdtar in ${CMD_TARGETS}; do
+		if [ ${tar} = ${cmdtar} ]; then
+			if [ ${CMD_FLAG} = true ]; then
 				continue 2;
 			fi
 
 			echo -e "${red}${CMD_TARGETS}${reset}"
-			make -C "${KUBE_ROOT}" $tar PRINT_HELP=y
+			make -C "${KUBE_ROOT}" ${tar} PRINT_HELP=y
 			echo "---------------------------------------------------------------------------------"
 
 			CMD_FLAG=true
@@ -45,6 +45,6 @@ for tar in $ALL_TARGETS; do
 	done
 
 	echo -e "${red}${tar}${reset}"
-	make -C "${KUBE_ROOT}" $tar PRINT_HELP=y
+	make -C "${KUBE_ROOT}" ${tar} PRINT_HELP=y
 	echo "---------------------------------------------------------------------------------"
 done