github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

fix shellcheck lint errors in cluster and hack scripts

Browse Source
This commit is contained in:
SataQiu 2019-02-23 14:06:54 +08:00
parent 0133d14170
commit 9cda80e836
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/gci/node-helper.sh
View File

@ -33,9 +33,13 @@ function get-node-instance-metadata-from-file {
echo "${metadata}" echo "${metadata}"
} }
# Assumed vars:
# scope_flags
# Parameters:
# $1: template name (required). # $1: template name (required).
function create-linux-node-instance-template { function create-linux-node-instance-template {
local template_name="$1" local template_name="$1"
ensure-gci-metadata-files ensure-gci-metadata-files
# shellcheck disable=2154 # 'scope_flags' is assigned by upstream
create-node-template "${template_name}" "${scope_flags[*]}" "$(get-node-instance-metadata-from-file)" "" "linux" create-node-template "${template_name}" "${scope_flags[*]}" "$(get-node-instance-metadata-from-file)" "" "linux"
} }

6
cluster/update-storage-objects.sh
View File

@ -25,7 +25,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
KUBECTL="${KUBE_OUTPUT_HOSTBIN}/kubectl" KUBECTL="${KUBE_OUTPUT_HOSTBIN}/kubectl"
@ -57,7 +57,7 @@ declare -a resources=(
) )
# Find all the namespaces. # Find all the namespaces.
namespaces=( $("${KUBECTL}" get namespaces -o go-template="{{range.items}}{{.metadata.name}} {{end}}")) IFS=" " read -r -a namespaces <<< "$("${KUBECTL}" get namespaces -o go-template="{{range.items}}{{.metadata.name}} {{end}}")"
if [ -z "${namespaces:-}" ] if [ -z "${namespaces:-}" ]
then then
echo "Unexpected: No namespace found. Nothing to do." echo "Unexpected: No namespace found. Nothing to do."
@ -74,7 +74,7 @@ do
# TODO hopefully we can remove this once we use dynamic discovery of gettable/updateable # TODO hopefully we can remove this once we use dynamic discovery of gettable/updateable
# resources. # resources.
set +e set +e
instances=( $("${KUBECTL}" get "${resource}" --namespace="${namespace}" -o go-template="{{range.items}}{{.metadata.name}} {{end}}")) IFS=" " read -r -a instances <<< "$("${KUBECTL}" get "${resource}" --namespace="${namespace}" -o go-template="{{range.items}}{{.metadata.name}} {{end}}")"
result=$? result=$?
set -e set -e

3
hack/.shellcheck_failures
View File

@ -12,7 +12,6 @@
./cluster/gce/gci/health-monitor.sh ./cluster/gce/gci/health-monitor.sh
./cluster/gce/gci/master-helper.sh ./cluster/gce/gci/master-helper.sh
./cluster/gce/gci/mounter/stage-upload.sh ./cluster/gce/gci/mounter/stage-upload.sh
./cluster/gce/gci/node-helper.sh
./cluster/gce/gci/shutdown.sh ./cluster/gce/gci/shutdown.sh
./cluster/gce/list-resources.sh ./cluster/gce/list-resources.sh
./cluster/gce/upgrade-aliases.sh ./cluster/gce/upgrade-aliases.sh
@ -34,7 +33,6 @@
./cluster/test-e2e.sh ./cluster/test-e2e.sh
./cluster/test-network.sh ./cluster/test-network.sh
./cluster/test-smoke.sh ./cluster/test-smoke.sh
./cluster/update-storage-objects.sh
./cluster/validate-cluster.sh ./cluster/validate-cluster.sh
./hack/cherry_pick_pull.sh ./hack/cherry_pick_pull.sh
./hack/generate-bindata.sh ./hack/generate-bindata.sh
@ -79,7 +77,6 @@
./hack/update-generated-kms-dockerized.sh ./hack/update-generated-kms-dockerized.sh
./hack/update-generated-protobuf-dockerized.sh ./hack/update-generated-protobuf-dockerized.sh
./hack/update-generated-runtime-dockerized.sh ./hack/update-generated-runtime-dockerized.sh
./hack/update-generated-runtime.sh
./hack/update-godep-licenses.sh ./hack/update-godep-licenses.sh
./hack/update-gofmt.sh ./hack/update-gofmt.sh
./hack/update-openapi-spec.sh ./hack/update-openapi-spec.sh

4
hack/update-generated-runtime.sh
View File

@ -18,12 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
# NOTE: All output from this script needs to be copied back to the calling # NOTE: All output from this script needs to be copied back to the calling
# source tree. This is managed in kube::build::copy_output in build/common.sh. # source tree. This is managed in kube::build::copy_output in build/common.sh.
# If the output set is changed update that function. # If the output set is changed update that function.
${KUBE_ROOT}/build/run.sh hack/update-generated-runtime-dockerized.sh "$@" "${KUBE_ROOT}/build/run.sh" hack/update-generated-runtime-dockerized.sh "$@"
# ex: ts=2 sw=2 et filetype=sh # ex: ts=2 sw=2 et filetype=sh