Merge pull request #73107 from rlenferink/patch-2

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

@@ -37,12 +37,12 @@ top_level_models=$(grep '&[A-Za-z]*{},' /register.go | sed 's/.*&//;s/{},//')
 VERSION="${1#*_}"
 for m in ${top_level_models}
 do
-  if grep -xq "=== ${VERSION}.$m" ./definitions.adoc
+  if grep -xq "=== ${VERSION}.${m}" ./definitions.adoc
   then
-    buf+="* <<${VERSION}.$m>>\n"
+    buf+="* <<${VERSION}.${m}>>\n"
   fi
 done
-sed -i "1i $buf" ./definitions.adoc
+sed -i "1i ${buf}" ./definitions.adoc
 
 # fix the links in .adoc, replace <<x.y>> with link:definitions.html#_x_y[x.y], and lowercase the _x_y part
 sed -i -e 's|<<\(.*\)\.\(.*\)>>|link:#_\L\1_\2\E[\1.\2]|g' ./definitions.adoc

hack/jenkins/build.sh

@@ -30,7 +30,7 @@ set -o xtrace
 # is an incoming variable Jenkins provides us for this job's scratch
 # space.
 export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
-export PATH=$PATH:/usr/local/go/bin
+export PATH=${PATH}:/usr/local/go/bin
 
 # Skip gcloud update checking
 export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true

hack/jenkins/gotest.sh

@@ -28,7 +28,7 @@ set -o xtrace
 # space.
 export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
 export GOPATH=${HOME}/_gopath
-export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
+export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:${PATH}
 
 # Install a few things needed by unit and /integration tests.
 command -v etcd &>/dev/null || ./hack/install-etcd.sh

hack/jenkins/upload-to-gcs.sh

@@ -139,9 +139,9 @@ function print_started() {
     # will be available as started["metadata"][KEY.lower()].
     echo "    \"metadata\": {"
     local sep=""  # leading commas are easy to track
-    for env_var in $metadata_keys; do
+    for env_var in ${metadata_keys}; do
       local var_upper="${env_var#BUILD_METADATA_}"
-      echo "        $sep\"${var_upper,,}\": \"${!env_var}\""
+      echo "        ${sep}\"${var_upper,,}\": \"${!env_var}\""
       sep=","
     done
     echo "    },"

hack/jenkins/verify-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/verify.sh

@@ -28,7 +28,7 @@ set -o xtrace
 # space.
 export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
 export GOPATH=${HOME}/_gopath
-export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
+export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:${PATH}
 
 # Install a few things needed by the verification tests.
 command -v etcd &>/dev/null || ./hack/install-etcd.sh

hack/lib/logging.sh

@@ -34,7 +34,7 @@ kube::log::errexit() {
     kube::log::error "Call tree:"
     for ((i=1;i<${#FUNCNAME[@]}-1;i++))
     do
-      kube::log::error " $i: ${BASH_SOURCE[$i+1]}:${BASH_LINENO[$i]} ${FUNCNAME[$i]}(...)"
+      kube::log::error " ${i}: ${BASH_SOURCE[${i}+1]}:${BASH_LINENO[${i}]} ${FUNCNAME[${i}]}(...)"
     done
   fi  
   kube::log::error_exit "Error in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}. '${BASH_COMMAND}' exited with status $err" "${1:-1}" 1
@@ -66,7 +66,7 @@ kube::log::stack() {
       local source_file=${BASH_SOURCE[$frame_no]}
       local source_lineno=${BASH_LINENO[$((frame_no - 1))]}
       local funcname=${FUNCNAME[$frame_no]}
-      echo "  $i: ${source_file}:${source_lineno} ${funcname}(...)" >&2
+      echo "  ${i}: ${source_file}:${source_lineno} ${funcname}(...)" >&2
     done
   fi
 }

hack/make-rules/test-e2e-node.sh

@@ -115,14 +115,14 @@ if [ ${remote} = true ] ; then
   IFS=',' read -ra IM <<< "${images}"
        images=""
        for i in "${IM[@]}"; do
-         if [[ $(gcloud compute instances list "${instance_prefix}-$i" | grep ${i}) ]]; then
-           if [[ ${hosts} != "" ]]; then
+         if [[ $(gcloud compute instances list "${instance_prefix}-${i}" | grep ${i}) ]]; then
+           if [[ "${hosts}" != "" ]]; then
              hosts="${hosts},"
            fi
-           echo "Reusing host ${instance_prefix}-$i"
+           echo "Reusing host ${instance_prefix}-${i}"
            hosts="${hosts}${instance_prefix}-${i}"
          else
-           if [[ ${images} != "" ]]; then
+           if [[ "${images}" != "" ]]; then
              images="${images},"
            fi
            images="${images}${i}"

hack/update-openapi-spec.sh

@@ -55,7 +55,7 @@ API_LOGFILE=${API_LOGFILE:-/tmp/openapi-api-server.log}
 
 kube::etcd::start
 
-echo "dummy_token,admin,admin" > $TMP_DIR/tokenauth.csv
+echo "dummy_token,admin,admin" > ${TMP_DIR}/tokenauth.csv
 
 # Start kube-apiserver
 kube::log::status "Starting kube-apiserver"
@@ -67,7 +67,7 @@ kube::log::status "Starting kube-apiserver"
   --advertise-address="10.10.10.10" \
   --cert-dir="${TMP_DIR}/certs" \
   --runtime-config="api/all=true" \
-  --token-auth-file=$TMP_DIR/tokenauth.csv \
+  --token-auth-file="${TMP_DIR}/tokenauth.csv" \
   --logtostderr \
   --v=2 \
   --service-cluster-ip-range="10.0.0.0/24" >"${API_LOGFILE}" 2>&1 &

hack/update-staging-godeps-dockerized.sh

@@ -36,7 +36,7 @@ if (( ${KUBE_VERBOSE} >= 6 )); then
 fi
 
 while getopts ":df" opt; do
-  case $opt in
+  case ${opt} in
     d) # do not godep-restore into a temporary directory, but use the existing GOPATH
       DRY_RUN=true
       ;;
@@ -44,7 +44,7 @@ while getopts ":df" opt; do
       FAIL_ON_DIFF=true
       ;;
     \?)
-      echo "Invalid option: -$OPTARG" >&2
+      echo "Invalid option: -${OPTARG}" >&2
       exit 1
       ;;
   esac

hack/update-translations.sh

@@ -23,7 +23,7 @@ generate_pot="false"
 generate_mo="false"
 
 while getopts "hf:xg" opt; do
-  case $opt in
+  case ${opt} in
     h)
       echo "$0 [-f files] [-x] [-g]"
       echo " -f <file-path>: Files to process"
@@ -78,10 +78,10 @@ fi
 if [[ "${generate_mo}" == "true" ]]; then
   echo "Generating .po and .mo files"
   for x in translations/*/*/*/*.po; do
-    msgcat -s $x > tmp.po
-    mv tmp.po $x
-    echo "generating .mo file for: $x"
-    msgfmt $x -o "$(dirname $x)/$(basename $x .po).mo"
+    msgcat -s ${x} > tmp.po
+    mv tmp.po ${x}
+    echo "generating .mo file for: ${x}"
+    msgfmt ${x} -o "$(dirname ${x})/$(basename ${x} .po).mo"
   done
 fi