diff --git a/build/common.sh b/build/common.sh index 9c16c571ac9..a68e0f26d47 100755 --- a/build/common.sh +++ b/build/common.sh @@ -14,6 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# shellcheck disable=SC2034 # Variables sourced in other scripts. + # Common utilities, variables and checks for all build scripts. set -o errexit set -o nounset @@ -97,10 +99,10 @@ kube::build::get_docker_wrapped_binaries() { ### If you change any of these lists, please also update DOCKERIZED_BINARIES ### in build/BUILD. And kube::golang::server_image_targets local targets=( - kube-apiserver,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" - kube-controller-manager,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" - kube-scheduler,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" - kube-proxy,"${KUBE_BASE_IMAGE_REGISTRY}/debian-iptables-${arch}:${debian_iptables_version}" + "kube-apiserver,${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" + "kube-controller-manager,${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" + "kube-scheduler,${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" + "kube-proxy,${KUBE_BASE_IMAGE_REGISTRY}/debian-iptables-${arch}:${debian_iptables_version}" ) echo "${targets[@]}" diff --git a/cluster/gce/gci/mounter/stage-upload.sh b/cluster/gce/gci/mounter/stage-upload.sh index ae1657e283a..37af6a2bf0a 100755 --- a/cluster/gce/gci/mounter/stage-upload.sh +++ b/cluster/gce/gci/mounter/stage-upload.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Copyright 2016 The Kubernetes Authors. # diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 783ee0f7eb1..1f0086d1628 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -1,4 +1,3 @@ -./build/common.sh ./build/lib/release.sh ./cluster/common.sh ./cluster/gce/config-default.sh @@ -7,13 +6,10 @@ ./cluster/gce/gci/configure.sh ./cluster/gce/gci/health-monitor.sh ./cluster/gce/gci/master-helper.sh -./cluster/gce/gci/mounter/stage-upload.sh ./cluster/gce/upgrade.sh ./cluster/gce/util.sh ./cluster/log-dump/log-dump.sh ./cluster/pre-existing/util.sh -./hack/lib/golang.sh -./hack/lib/test.sh ./test/cmd/apply.sh ./test/cmd/apps.sh ./test/cmd/core.sh diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index d39f2df3e23..e9a5af98547 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -14,6 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# shellcheck disable=SC2034 # Variables sourced in other scripts. + # The golang package that we are building. readonly KUBE_GO_PACKAGE=k8s.io/kubernetes readonly KUBE_GOPATH="${KUBE_OUTPUT}/go" diff --git a/hack/lib/test.sh b/hack/lib/test.sh index b04a82905b9..23a7563ff43 100644 --- a/hack/lib/test.sh +++ b/hack/lib/test.sh @@ -14,6 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# shellcheck disable=SC2034 # Variables sourced in other scripts. + # A set of helpers for tests readonly reset=$(tput sgr0)