Merge remote-tracking branch 'upstream/master' into test-cmd-what

hack/.golint_failures

@@ -2,14 +2,9 @@ cmd/cloud-controller-manager/app/apis/config/v1alpha1
 cmd/kube-apiserver/app
 cmd/kube-controller-manager/app
 cmd/kube-proxy/app
-cmd/kubeadm/app
 cmd/kubeadm/app/apis/kubeadm/v1alpha3
 cmd/kubeadm/app/apis/kubeadm/v1beta1
-cmd/kubeadm/app/util/config
 cmd/kubeadm/app/util/system
-cmd/kubelet/app
-cmd/kubelet/app/options
-cmd/kubemark
 pkg/apis/abac/latest
 pkg/apis/admission
 pkg/apis/admission/v1beta1
@@ -57,7 +52,6 @@ pkg/apis/events
 pkg/apis/events/v1beta1
 pkg/apis/extensions
 pkg/apis/extensions/v1beta1
-pkg/apis/extensions/validation
 pkg/apis/imagepolicy
 pkg/apis/imagepolicy/v1alpha1
 pkg/apis/networking
@@ -220,7 +214,6 @@ pkg/kubelet/remote
 pkg/kubelet/secret
 pkg/kubelet/server
 pkg/kubelet/server/portforward
-pkg/kubelet/server/remotecommand
 pkg/kubelet/server/stats
 pkg/kubelet/server/streaming
 pkg/kubelet/stats
@@ -229,10 +222,7 @@ pkg/kubelet/status/testing
 pkg/kubelet/sysctl
 pkg/kubelet/types
 pkg/kubelet/util
-pkg/kubelet/util/cache
 pkg/kubelet/util/pluginwatcher
-pkg/kubelet/util/queue
-pkg/kubelet/util/sliceutils
 pkg/kubemark
 pkg/master
 pkg/master/controller/crdregistration
@@ -313,8 +303,6 @@ pkg/registry/core/service/storage
 pkg/registry/core/serviceaccount/storage
 pkg/registry/events/rest
 pkg/registry/extensions/controller/storage
-pkg/registry/extensions/ingress
-pkg/registry/extensions/ingress/storage
 pkg/registry/extensions/rest
 pkg/registry/networking/networkpolicy/storage
 pkg/registry/networking/rest
@@ -339,7 +327,6 @@ pkg/registry/settings/rest
 pkg/registry/storage/rest
 pkg/registry/storage/storageclass
 pkg/registry/storage/storageclass/storage
-pkg/routes
 pkg/scheduler/apis/config/v1alpha1
 pkg/security/apparmor
 pkg/security/podsecuritypolicy
@@ -542,7 +529,6 @@ staging/src/k8s.io/apiserver/pkg/endpoints
 staging/src/k8s.io/apiserver/pkg/endpoints/discovery
 staging/src/k8s.io/apiserver/pkg/endpoints/filters
 staging/src/k8s.io/apiserver/pkg/endpoints/handlers
-staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation
 staging/src/k8s.io/apiserver/pkg/endpoints/metrics
 staging/src/k8s.io/apiserver/pkg/endpoints/openapi/testing
 staging/src/k8s.io/apiserver/pkg/endpoints/request
@@ -572,7 +558,6 @@ staging/src/k8s.io/apiserver/pkg/storage/testing
 staging/src/k8s.io/apiserver/pkg/storage/tests
 staging/src/k8s.io/apiserver/pkg/storage/value
 staging/src/k8s.io/apiserver/pkg/util/feature
-staging/src/k8s.io/apiserver/pkg/util/flag
 staging/src/k8s.io/apiserver/pkg/util/proxy
 staging/src/k8s.io/apiserver/pkg/util/webhook
 staging/src/k8s.io/apiserver/pkg/util/wsstream
@@ -647,17 +632,9 @@ staging/src/k8s.io/code-generator/cmd/client-gen/types
 staging/src/k8s.io/code-generator/cmd/conversion-gen/generators
 staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
 staging/src/k8s.io/code-generator/cmd/lister-gen/generators
+staging/src/k8s.io/component-base/cli/flag
 staging/src/k8s.io/component-base/config/v1alpha1
-staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration
-staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
-staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
-staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation
-staging/src/k8s.io/kube-aggregator/pkg/apiserver
-staging/src/k8s.io/kube-aggregator/pkg/cmd/server
 staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
-staging/src/k8s.io/kube-aggregator/pkg/controllers/status
-staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice
-staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
 staging/src/k8s.io/kube-proxy/config/v1alpha1
 staging/src/k8s.io/kubelet/config/v1beta1
 staging/src/k8s.io/metrics/pkg/apis/custom_metrics
@@ -694,12 +671,8 @@ test/e2e/cloud
 test/e2e/common
 test/e2e/framework
 test/e2e/framework/ingress
-test/e2e/framework/metrics
-test/e2e/framework/providers/aws
-test/e2e/framework/providers/azure
 test/e2e/framework/providers/gce
 test/e2e/framework/providers/kubemark
-test/e2e/framework/timer
 test/e2e/instrumentation
 test/e2e/instrumentation/logging
 test/e2e/instrumentation/monitoring

hack/.shellcheck_failures

@@ -7,7 +7,6 @@
 ./cluster/gce/config-common.sh
 ./cluster/gce/config-default.sh
 ./cluster/gce/config-test.sh
-./cluster/gce/delete-stranded-load-balancers.sh
 ./cluster/gce/gci/configure-helper.sh
 ./cluster/gce/gci/configure.sh
 ./cluster/gce/gci/flexvolume_node_setup.sh
@@ -21,13 +20,10 @@
 ./cluster/gce/upgrade.sh
 ./cluster/gce/util.sh
 ./cluster/images/conformance/run_e2e.sh
-./cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh
 ./cluster/juju/prereqs/ubuntu-juju.sh
 ./cluster/juju/util.sh
-./cluster/kube-down.sh
 ./cluster/kube-up.sh
 ./cluster/kube-util.sh
-./cluster/kubeadm.sh
 ./cluster/kubectl.sh
 ./cluster/kubemark/gce/config-default.sh
 ./cluster/kubemark/iks/config-default.sh
@@ -41,20 +37,9 @@
 ./cluster/test-smoke.sh
 ./cluster/update-storage-objects.sh
 ./cluster/validate-cluster.sh
-./hack/benchmark-go.sh
-./hack/build-cross.sh
-./hack/build-go.sh
 ./hack/cherry_pick_pull.sh
-./hack/e2e-internal/e2e-cluster-size.sh
-./hack/e2e-internal/e2e-down.sh
-./hack/e2e-internal/e2e-grow-cluster.sh
-./hack/e2e-internal/e2e-shrink-cluster.sh
-./hack/e2e-internal/e2e-status.sh
-./hack/e2e-internal/e2e-up.sh
-./hack/e2e-node-test.sh
 ./hack/generate-bindata.sh
 ./hack/generate-docs.sh
-./hack/get-build.sh
 ./hack/ginkgo-e2e.sh
 ./hack/godep-restore.sh
 ./hack/godep-save.sh
@@ -88,25 +73,12 @@
 ./hack/make-rules/update.sh
 ./hack/make-rules/verify.sh
 ./hack/make-rules/vet.sh
-./hack/print-workspace-status.sh
-./hack/run-in-gopath.sh
-./hack/test-go.sh
 ./hack/test-integration.sh
 ./hack/test-update-storage-objects.sh
-./hack/update-all.sh
 ./hack/update-bazel.sh
 ./hack/update-codegen.sh
-./hack/update-generated-device-plugin-dockerized.sh
-./hack/update-generated-device-plugin.sh
-./hack/update-generated-docs.sh
 ./hack/update-generated-kms-dockerized.sh
-./hack/update-generated-kms.sh
-./hack/update-generated-kubelet-plugin-registration-dockerized.sh
-./hack/update-generated-kubelet-plugin-registration.sh
-./hack/update-generated-pod-resources-dockerized.sh
-./hack/update-generated-pod-resources.sh
 ./hack/update-generated-protobuf-dockerized.sh
-./hack/update-generated-protobuf.sh
 ./hack/update-generated-runtime-dockerized.sh
 ./hack/update-generated-runtime.sh
 ./hack/update-generated-swagger-docs.sh
@@ -117,16 +89,13 @@
 ./hack/update-staging-godeps.sh
 ./hack/update-translations.sh
 ./hack/update-workspace-mirror.sh
-./hack/verify-all.sh
 ./hack/verify-api-groups.sh
-./hack/verify-bazel.sh
 ./hack/verify-boilerplate.sh
 ./hack/verify-cli-conventions.sh
 ./hack/verify-codegen.sh
 ./hack/verify-description.sh
 ./hack/verify-generated-device-plugin.sh
 ./hack/verify-generated-docs.sh
-./hack/verify-generated-files-remake.sh
 ./hack/verify-generated-files.sh
 ./hack/verify-generated-kms.sh
 ./hack/verify-generated-kubelet-plugin-registration.sh
@@ -134,13 +103,9 @@
 ./hack/verify-generated-protobuf.sh
 ./hack/verify-generated-runtime.sh
 ./hack/verify-generated-swagger-docs.sh
-./hack/verify-godep-licenses.sh
-./hack/verify-godeps.sh
-./hack/verify-gofmt.sh
 ./hack/verify-golint.sh
 ./hack/verify-govet.sh
 ./hack/verify-import-boss.sh
-./hack/verify-imports.sh
 ./hack/verify-linkcheck.sh
 ./hack/verify-no-vendor-cycles.sh
 ./hack/verify-openapi-spec.sh
@@ -157,17 +122,8 @@
 ./pkg/kubectl/cmd/edit/testdata/record_testcase.sh
 ./pkg/util/verify-util-pkg.sh
 ./plugin/pkg/admission/imagepolicy/gencerts.sh
-./staging/src/k8s.io/csi-api/hack/update-codegen.sh
-./staging/src/k8s.io/csi-api/hack/verify-codegen.sh
-./staging/src/k8s.io/kube-aggregator/hack/build-image.sh
-./staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh
-./staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh
-./staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
-./staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh
 ./staging/src/k8s.io/metrics/hack/update-codegen.sh
 ./staging/src/k8s.io/metrics/hack/verify-codegen.sh
-./staging/src/k8s.io/node-api/hack/update-codegen.sh
-./staging/src/k8s.io/node-api/hack/verify-codegen.sh
 ./test/cmd/apply.sh
 ./test/cmd/apps.sh
 ./test/cmd/authorization.sh
@@ -210,16 +166,12 @@
 ./test/images/volume/rbd/create_block.sh
 ./test/images/volume/rbd/mon.sh
 ./test/images/volume/rbd/osd.sh
-./test/integration/ipamperf/test-performance.sh
-./test/integration/scheduler_perf/test-performance.sh
 ./test/kubemark/common/util.sh
-./test/kubemark/configure-kubectl.sh
 ./test/kubemark/gce/util.sh
 ./test/kubemark/iks/shutdown.sh
 ./test/kubemark/iks/startup.sh
 ./test/kubemark/iks/util.sh
 ./test/kubemark/master-log-dump.sh
-./test/kubemark/pre-existing/util.sh
 ./test/kubemark/resources/start-kubemark-master.sh
 ./test/kubemark/run-e2e-tests.sh
 ./test/kubemark/start-kubemark.sh

hack/OWNERS

@@ -1,4 +1,7 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 reviewers:
+  - bentheelder
   - cblecker
   - eparis
   - fejta

hack/benchmark-go.sh

@@ -18,8 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-
 make test \
     WHAT="$*" \
     KUBE_COVER="" \

hack/build-cross.sh

@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 echo "NOTE: $0 has been replaced by 'make cross'"
 echo

hack/build-go.sh

@@ -20,12 +20,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""
 if [[ "$#" -gt 0 ]]; then
-    ARGHELP="WHAT='$@'"
+    ARGHELP="WHAT='$*'"
 fi
 
 echo "NOTE: $0 has been replaced by 'make' or 'make all'"

hack/e2e-internal/e2e-cluster-size.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
-: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
-: ${KUBE_CONFIG_FILE:="config-test.sh"}
+: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
+: "${KUBE_CONFIG_FILE:="config-test.sh"}"
 
 export KUBECTL KUBE_CONFIG_FILE
 

hack/e2e-internal/e2e-down.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
-: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
-: ${KUBE_CONFIG_FILE:="config-test.sh"}
+: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
+: "${KUBE_CONFIG_FILE:="config-test.sh"}"
 
 export KUBECTL KUBE_CONFIG_FILE
 

hack/e2e-internal/e2e-grow-cluster.sh

@@ -14,18 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
-if [[ ! -z "${1:-}" ]]; then
+if [[ -n "${1:-}" ]]; then
   export KUBE_GCE_ZONE="${1}"
 fi
-if [[ ! -z "${2:-}" ]]; then
+if [[ -n "${2:-}" ]]; then
   export MULTIZONE="${2}"
 fi
-if [[ ! -z "${3:-}" ]]; then
+if [[ -n "${3:-}" ]]; then
   export KUBE_REPLICATE_EXISTING_MASTER="${3}"
 fi
-if [[ ! -z "${4:-}" ]]; then
+if [[ -n "${4:-}" ]]; then
   export KUBE_USE_EXISTING_MASTER="${4}"
 fi
 if [[ -z "${NUM_NODES:-}" ]]; then

hack/e2e-internal/e2e-shrink-cluster.sh

@@ -14,18 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
-if [[ ! -z "${1:-}" ]]; then
+if [[ -n "${1:-}" ]]; then
   export KUBE_GCE_ZONE="${1}"
 fi
-if [[ ! -z "${2:-}" ]]; then
+if [[ -n "${2:-}" ]]; then
   export MULTIZONE="${2}"
 fi
-if [[ ! -z "${3:-}" ]]; then
+if [[ -n "${3:-}" ]]; then
   export KUBE_DELETE_NODES="${3}"
 fi
-if [[ ! -z "${4:-}" ]]; then
+if [[ -n "${4:-}" ]]; then
   export KUBE_USE_EXISTING_MASTER="${4}"
 fi
 

hack/e2e-internal/e2e-status.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
-: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
-: ${KUBE_CONFIG_FILE:="config-test.sh"}
+: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
+: "${KUBE_CONFIG_FILE:="config-test.sh"}"
 
 export KUBECTL KUBE_CONFIG_FILE
 

hack/e2e-internal/e2e-up.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
-: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
-: ${KUBE_CONFIG_FILE:="config-test.sh"}
+: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
+: "${KUBE_CONFIG_FILE:="config-test.sh"}"
 
 export KUBECTL KUBE_CONFIG_FILE
 

hack/e2e-node-test.sh

@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""
@@ -40,4 +40,4 @@ echo "The equivalent of this invocation is: "
 echo "    make test-e2e-node ${ARGHELP}"
 echo
 echo
-make --no-print-directory -C "${KUBE_ROOT}" test-e2e-node FOCUS=${FOCUS:-} SKIP=${SKIP:-}
+make --no-print-directory -C "${KUBE_ROOT}" test-e2e-node FOCUS="${FOCUS:-}" SKIP="${SKIP:-}"

hack/get-build.sh

@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 source "${KUBE_ROOT}/cluster/common.sh"
 

hack/godep-save.sh

@@ -56,6 +56,7 @@ fi
 # won't pick them up.
 REQUIRED_BINS=(
   "github.com/bazelbuild/bazel-gazelle/cmd/gazelle"
+  "github.com/bazelbuild/buildtools/buildozer"
   "github.com/cespare/prettybench"
   "github.com/client9/misspell/cmd/misspell"
   "github.com/cloudflare/cfssl/cmd/cfssl"
@@ -101,6 +102,8 @@ hack/update-godep-licenses.sh >/dev/null
 kube::log::status "Creating OWNERS file"
 rm -f "Godeps/OWNERS" "vendor/OWNERS"
 cat <<__EOF__ > "Godeps/OWNERS"
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
 - dep-approvers
 __EOF__

hack/jenkins/OWNERS

@@ -1,3 +1,5 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
 - sig-testing-approvers
 reviewers:

hack/jenkins/benchmark-dockerized.sh

@@ -34,12 +34,14 @@ retry() {
 export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
 
 go install k8s.io/kubernetes/vendor/github.com/cespare/prettybench
+go install k8s.io/kubernetes/vendor/github.com/jstemmer/go-junit-report
 
 # Disable the Go race detector.
 export KUBE_RACE=" "
 # Disable coverage report
 export KUBE_COVER="n"
 export ARTIFACTS=${ARTIFACTS:-"${WORKSPACE}/artifacts"}
+export FULL_LOG="true"
 
 mkdir -p "${ARTIFACTS}"
 cd /go/src/k8s.io/kubernetes

hack/jenkins/test-dockerized.sh

@@ -56,4 +56,3 @@ go install ./cmd/...
 
 make test-cmd
 make test-integration
-./hack/test-update-storage-objects.sh

hack/lib/etcd.sh

@@ -105,11 +105,18 @@ kube::etcd::cleanup() {
 kube::etcd::install() {
   (
     local os
+    local arch
+
+    os=$(kube::util::host_os)
+    arch=$(kube::util::host_arch)
+
     cd "${KUBE_ROOT}/third_party"
-    os=$(uname | tr "[:upper:]" "[:lower:]")
     if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then
+      kube::log::info "etcd v${ETCD_VERSION} already installed at path:"
+      kube::log::info "$(pwd)/$(readlink etcd)"
       return  # already installed
     fi
+
     if [[ ${os} == "darwin" ]]; then
       download_file="etcd-v${ETCD_VERSION}-darwin-amd64.zip"
       url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${download_file}"
@@ -118,11 +125,11 @@ kube::etcd::install() {
       ln -fns "etcd-v${ETCD_VERSION}-darwin-amd64" etcd
       rm "${download_file}"
     else
-      url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz"
-      download_file="etcd-v${ETCD_VERSION}-linux-amd64.tar.gz"
+      url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-${arch}.tar.gz"
+      download_file="etcd-v${ETCD_VERSION}-linux-${arch}.tar.gz"
       kube::util::download_file "${url}" "${download_file}"
       tar xzf "${download_file}"
-      ln -fns "etcd-v${ETCD_VERSION}-linux-amd64" etcd
+      ln -fns "etcd-v${ETCD_VERSION}-linux-${arch}" etcd
       rm "${download_file}"
     fi
     kube::log::info "etcd v${ETCD_VERSION} installed. To use:"

hack/lib/init.sh

@@ -79,6 +79,7 @@ extensions/v1beta1 \
 events.k8s.io/v1beta1 \
 imagepolicy.k8s.io/v1alpha1 \
 networking.k8s.io/v1 \
+networking.k8s.io/v1beta1 \
 policy/v1beta1 \
 rbac.authorization.k8s.io/v1 \
 rbac.authorization.k8s.io/v1beta1 \

hack/lib/util.sh

@@ -339,10 +339,9 @@ kube::util::create-fake-git-tree() {
 kube::util::godep_restored() {
   local -r godeps_json=${1:-Godeps/Godeps.json}
   local -r gopath=${2:-${GOPATH%:*}}
-  if ! which jq &>/dev/null; then
-    echo "jq not found. Please install." 1>&2
-    return 1
-  fi
+
+  kube::util::require-jq
+
   local root
   local old_rev=""
   while read path rev; do
@@ -461,7 +460,7 @@ kube::util::base_ref() {
   fi
 
   full_branch="$(kube::util::git_upstream_remote_name)/${git_branch}"
-  
+
   # make sure the branch is valid, otherwise the check will pass erroneously.
   if ! git describe "${full_branch}" >/dev/null; then
     # abort!
@@ -479,7 +478,7 @@ kube::util::has_changes() {
   local -r git_branch=$1
   local -r pattern=$2
   local -r not_pattern=${3:-totallyimpossiblepattern}
-  
+
   local base_ref=$(kube::util::base_ref "${git_branch}")
   echo "Checking for '${pattern}' changes against '${base_ref}'"
 
@@ -775,6 +774,32 @@ function kube::util::ensure-gnu-sed {
   fi
 }
 
+# kube::util::check-file-in-alphabetical-order <file>
+# Check that the file is in alphabetical order
+#
+function kube::util::check-file-in-alphabetical-order {
+  local failure_file="$1"
+  if ! diff -u "${failure_file}" <(LC_ALL=C sort "${failure_file}"); then
+    {
+      echo
+      echo "${failure_file} is not in alphabetical order. Please sort it:"
+      echo
+      echo "  LC_ALL=C sort -o ${failure_file} ${failure_file}"
+      echo
+    } >&2
+    false
+  fi
+}
+
+# kube::util::require-jq
+# Checks whether jq is installed.
+function kube::util::require-jq {
+  if ! which jq &>/dev/null; then
+    echo "jq not found. Please install." 1>&2
+    return 1
+  fi
+}
+
 # Some useful colors.
 if [[ -z "${color_start-}" ]]; then
   declare -r color_start="\033["

hack/local-up-cluster.sh

@@ -116,6 +116,9 @@ START_MODE=${START_MODE:-"all"}
 # A list of controllers to enable
 KUBE_CONTROLLERS="${KUBE_CONTROLLERS:-"*"}"
 
+# Audit policy
+AUDIT_POLICY_FILE=${AUDIT_POLICY_FILE:-""}
+
 # sanity check for OpenStack provider
 if [ "${CLOUD_PROVIDER}" == "openstack" ]; then
     if [ "${CLOUD_CONFIG}" == "" ]; then
@@ -552,6 +555,17 @@ function start_apiserver {
       cloud_config_arg="--cloud-provider=external"
     fi
 
+    if [[ -n "${AUDIT_POLICY_FILE}" ]]; then
+      cat <<EOF > /tmp/kube-audit-policy-file
+# Log all requests at the Metadata level.
+apiVersion: audit.k8s.io/v1
+kind: Policy
+rules:
+- level: Metadata
+EOF
+      AUDIT_POLICY_FILE="/tmp/kube-audit-policy-file"
+    fi
+
     APISERVER_LOG=${LOG_DIR}/kube-apiserver.log
     ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" apiserver ${authorizer_arg} ${priv_arg} ${runtime_config} \
       ${cloud_config_arg} \
@@ -559,6 +573,8 @@ function start_apiserver {
       ${node_port_range} \
       --v=${LOG_LEVEL} \
       --vmodule="${LOG_SPEC}" \
+      --audit-policy-file="${AUDIT_POLICY_FILE}" \
+      --audit-log-path=${LOG_DIR}/kube-apiserver-audit.log \
       --cert-dir="${CERT_DIR}" \
       --client-ca-file="${CERT_DIR}/client-ca.crt" \
       --kubelet-client-certificate="${CERT_DIR}/client-kube-apiserver.crt" \

hack/make-rules/test-cmd.sh

@@ -41,7 +41,7 @@ function run_kube_apiserver() {
   AUTHORIZATION_MODE="RBAC,AlwaysAllow"
 
   # Enable features
-  ENABLE_FEATURE_GATES="DryRun=true"
+  ENABLE_FEATURE_GATES="ServerSideApply=true"
 
   "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
     --insecure-bind-address="127.0.0.1" \

hack/make-rules/test-integration.sh

@@ -83,7 +83,7 @@ checkEtcdOnPath() {
   kube::log::status "Checking etcd is on PATH"
   which etcd && return
   kube::log::status "Cannot find etcd, cannot run integration tests."
-  kube::log::status "Please see https://github.com/kubernetes/community/blob/master/contributors/devel/testing.md#install-etcd-dependency for instructions."
+  kube::log::status "Please see https://git.k8s.io/community/contributors/devel/sig-testing/testing.md#install-etcd-dependency for instructions."
   kube::log::usage "You can use 'hack/install-etcd.sh' to install a copy in third_party/."
   return 1
 }

hack/make-rules/test.sh

@@ -188,6 +188,10 @@ if [[ -n "${KUBE_JUNIT_REPORT_DIR}" ]] ; then
   go_test_grep_pattern="^[^[:space:]]\+[[:space:]]\+[^[:space:]]\+/[^[[:space:]]\+"
 fi
 
+if [[ -n "${FULL_LOG:-}" ]] ; then
+  go_test_grep_pattern=".*"
+fi
+
 # Filter out arguments that start with "-" and move them to goflags.
 testcases=()
 for arg; do
@@ -223,6 +227,10 @@ verifyAndSuggestPackagePath() {
   local original_package_path="$3"
   local suggestion_package_path="$4"
 
+  if [[ "${specified_package_path}" =~ '/...'$ ]]; then
+    specified_package_path=${specified_package_path::-4}
+  fi
+
   if ! [ -d "${specified_package_path}" ]; then
     # Because k8s sets a localized $GOPATH for testing, seeing the actual
     # directory can be confusing. Instead, just show $GOPATH if it exists in the

hack/print-workspace-status.sh

@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 source "${KUBE_ROOT}/hack/lib/version.sh"
 kube::version::get_version_vars

hack/run-in-gopath.sh

@@ -23,7 +23,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 # This sets up a clean GOPATH and makes sure we are currently in it.

hack/test-go.sh

@@ -20,12 +20,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""
 if [[ "$#" -gt 0 ]]; then
-    ARGHELP="WHAT='$@'"
+    ARGHELP="WHAT='$*'"
 fi
 
 echo "NOTE: $0 has been replaced by 'make test'"

hack/testdata/OWNERS

@@ -1,3 +1,5 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
 - sig-cli-maintainers
 reviewers:

hack/update-all.sh

@@ -21,7 +21,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 echo "NOTE: $0 has been replaced by 'make update'"
 echo

hack/update-bazel.sh

@@ -26,6 +26,7 @@ PATH="${GOBIN}:${PATH}"
 
 # Install tools we need, but only from vendor/...
 go install k8s.io/kubernetes/vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
+go install k8s.io/kubernetes/vendor/github.com/bazelbuild/buildtools/buildozer
 go install k8s.io/kubernetes/vendor/k8s.io/repo-infra/kazel
 
 touch "${KUBE_ROOT}/vendor/BUILD"
@@ -43,3 +44,11 @@ gazelle fix \
     "${KUBE_ROOT}"
 
 kazel
+
+# make targets in vendor manual
+# buildozer exits 3 when no changes are made ¯\_(ツ)_/¯
+# https://github.com/bazelbuild/buildtools/tree/master/buildozer#error-code
+buildozer -quiet 'add tags manual' '//vendor/...:%go_binary' '//vendor/...:%go_test' && ret=$? || ret=$?
+if [[ $ret != 0 && $ret != 3 ]]; then
+  exit 1
+fi

hack/update-generated-device-plugin-dockerized.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../" && pwd -P)"
+KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd -P)"
 DEVICE_PLUGIN_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha/"
 DEVICE_PLUGIN_V1BETA1="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1beta1/"
 
 source "${KUBE_ROOT}/hack/lib/protoc.sh"
-kube::protoc::generate_proto ${DEVICE_PLUGIN_ALPHA}
-kube::protoc::generate_proto ${DEVICE_PLUGIN_V1BETA1}
+kube::protoc::generate_proto "${DEVICE_PLUGIN_ALPHA}"
+kube::protoc::generate_proto "${DEVICE_PLUGIN_V1BETA1}"

hack/update-generated-device-plugin.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 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
 # source tree.  This is managed in kube::build::copy_output in build/common.sh.
 # If the output set is changed update that function.
 
-${KUBE_ROOT}/build/run.sh hack/update-generated-device-plugin-dockerized.sh "$@"
+"${KUBE_ROOT}/build/run.sh" hack/update-generated-device-plugin-dockerized.sh "$@"

hack/update-generated-docs.sh

@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env

hack/update-generated-kms.sh

@@ -18,12 +18,12 @@ set -o errexit
 set -o nounset
 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
 # source tree.  This is managed in kube::build::copy_output in build/common.sh.
 # If the output set is changed update that function.
 
-${KUBE_ROOT}/build/run.sh hack/update-generated-kms-dockerized.sh "$@"
+"${KUBE_ROOT}/build/run.sh" hack/update-generated-kms-dockerized.sh "$@"
 
 # ex: ts=2 sw=2 et filetype=sh

hack/update-generated-kubelet-plugin-registration-dockerized.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2018 The Kubernetes Authors.
 #
@@ -18,14 +18,14 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../" && pwd -P)"
+KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd -P)"
 KUBELET_PLUGIN_REGISTRATION_V1ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1alpha1/"
 KUBELET_PLUGIN_REGISTRATION_V1BETA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1beta1/"
 KUBELET_EXAMPLE_PLUGIN_V1BETA1="${KUBE_ROOT}/pkg/kubelet/util/pluginwatcher/example_plugin_apis/v1beta1/"
 KUBELET_EXAMPLE_PLUGIN_V1BETA2="${KUBE_ROOT}/pkg/kubelet/util/pluginwatcher/example_plugin_apis/v1beta2/"
 
 source "${KUBE_ROOT}/hack/lib/protoc.sh"
-kube::protoc::generate_proto ${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}
-kube::protoc::generate_proto ${KUBELET_PLUGIN_REGISTRATION_V1BETA}
-kube::protoc::generate_proto ${KUBELET_EXAMPLE_PLUGIN_V1BETA1}
-kube::protoc::generate_proto ${KUBELET_EXAMPLE_PLUGIN_V1BETA2}
+kube::protoc::generate_proto "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}"
+kube::protoc::generate_proto "${KUBELET_PLUGIN_REGISTRATION_V1BETA}"
+kube::protoc::generate_proto "${KUBELET_EXAMPLE_PLUGIN_V1BETA1}"
+kube::protoc::generate_proto "${KUBELET_EXAMPLE_PLUGIN_V1BETA2}"

hack/update-generated-kubelet-plugin-registration.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2018 The Kubernetes Authors.
 #
@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 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
 # source tree.  This is managed in kube::build::copy_output in build/common.sh.
 # If the output set is changed update that function.
 
-${KUBE_ROOT}/build/run.sh hack/update-generated-kubelet-plugin-registration-dockerized.sh "$@"
+"${KUBE_ROOT}/build/run.sh" hack/update-generated-kubelet-plugin-registration-dockerized.sh "$@"

hack/update-generated-pod-resources-dockerized.sh

@@ -18,8 +18,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../" && pwd -P)"
+KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd -P)"
 POD_RESOURCES_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/podresources/v1alpha1/"
 
 source "${KUBE_ROOT}/hack/lib/protoc.sh"
-kube::protoc::generate_proto ${POD_RESOURCES_ALPHA}
+kube::protoc::generate_proto "${POD_RESOURCES_ALPHA}"

hack/update-generated-pod-resources.sh

@@ -18,10 +18,10 @@ set -o errexit
 set -o nounset
 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
 # source tree.  This is managed in kube::build::copy_output in build/common.sh.
 # If the output set is changed update that function.
 
-${KUBE_ROOT}/build/run.sh hack/update-generated-pod-resources-dockerized.sh "$@"
+"${KUBE_ROOT}/build/run.sh" hack/update-generated-pod-resources-dockerized.sh "$@"

hack/update-generated-protobuf-dockerized.sh

@@ -79,6 +79,7 @@ PACKAGES=(
   k8s.io/api/admissionregistration/v1beta1
   k8s.io/api/admission/v1beta1
   k8s.io/api/auditregistration/v1alpha1
+  k8s.io/api/networking/v1beta1
   k8s.io/api/networking/v1
   k8s.io/metrics/pkg/apis/metrics/v1alpha1
   k8s.io/metrics/pkg/apis/metrics/v1beta1

hack/update-generated-protobuf.sh

@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 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
 # source tree.  This is managed in kube::build::copy_output in build/common.sh.

hack/update-openapi-spec.sh

@@ -25,6 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 OPENAPI_ROOT_DIR="${KUBE_ROOT}/api/openapi-spec"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
+kube::util::require-jq
 kube::golang::setup_env
 
 make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
@@ -83,7 +84,7 @@ fi
 
 kube::log::status "Updating " ${OPENAPI_ROOT_DIR}
 
-curl -w "\n" -fs "${API_HOST}:${API_PORT}/openapi/v2" > "${OPENAPI_ROOT_DIR}/swagger.json"
+curl -w "\n" -fs "${API_HOST}:${API_PORT}/openapi/v2" | jq -S . > "${OPENAPI_ROOT_DIR}/swagger.json"
 
 kube::log::status "SUCCESS"
 

hack/verify-all.sh

@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""

hack/verify-bazel.sh

@@ -17,7 +17,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+export KUBE_ROOT
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 if [[ ! -f "${KUBE_ROOT}/vendor/BUILD" ]]; then
@@ -31,7 +32,7 @@ fi
 # TODO(spxtr): Remove this line once Bazel is the only way to build.
 rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go"
 
-_tmpdir="$(kube::realpath $(mktemp -d -t verify-bazel.XXXXXX))"
+_tmpdir="$(kube::realpath "$(mktemp -d -t verify-bazel.XXXXXX)")"
 kube::util::trap_add "rm -rf ${_tmpdir}" EXIT
 
 _tmp_gopath="${_tmpdir}/go"

hack/verify-flags/OWNERS

@@ -1,3 +1,5 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
 - sig-cli-maintainers
 reviewers:

hack/verify-generated-files-remake.sh

@@ -18,12 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::util::ensure_clean_working_dir
 
-_tmpdir="$(kube::realpath $(mktemp -d -t verify-generated-files.XXXXXX))"
+_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
 kube::util::trap_add "rm -rf ${_tmpdir}" EXIT
 
 _tmp_gopath="${_tmpdir}/go"
@@ -73,10 +73,11 @@ function assert_clean() {
     make generated_files >/dev/null
     touch "${STAMP}"
     make generated_files >/dev/null
-    X=($(newer deepcopy "${STAMP}"))
-    if [[ "${#X[*]}" != 0 ]]; then
+    X="$(newer deepcopy "${STAMP}")"
+    if [[ -n "${X}" ]]; then
         echo "Generated files changed on back-to-back 'make' runs:"
-        echo "  ${X[*]:-(none)}"
+        echo "  ${X}" | tr '\n' ' '
+        echo ""
         return 1
     fi
     true
@@ -91,25 +92,28 @@ STAMP=/tmp/stamp.$RANDOM
 assert_clean
 
 DIR=staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1
-touch "$DIR/types.go"
+touch "${DIR}/types.go"
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(newer deepcopy "${STAMP}"))
-if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "${DIR}/zz_generated.deepcopy.go" ) ]]; then
+X="$(newer deepcopy "${STAMP}")"
+if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.deepcopy.go" ]]; then
     echo "Wrong generated deepcopy files changed after touching src file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X:-(none)}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
-X=($(newer defaults "${STAMP}"))
-if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "${DIR}/zz_generated.defaults.go" ) ]]; then
+X="$(newer defaults "${STAMP}")"
+if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.defaults.go" ]]; then
     echo "Wrong generated defaults files changed after touching src file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X:-(none)}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
-X=($(newer conversion "${STAMP}"))
-if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "${DIR}/zz_generated.conversion.go" ) ]]; then
+X="$(newer conversion "${STAMP}")"
+if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.conversion.go" ]]; then
     echo "Wrong generated conversion files changed after touching src file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X:-(none)}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -122,10 +126,11 @@ assert_clean
 touch staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older deepcopy "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older deepcopy "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated deepcopy files did not change after touching code-generator file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -134,10 +139,11 @@ assert_clean
 touch staging/src/k8s.io/code-generator/cmd/deepcopy-gen/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older deepcopy "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older deepcopy "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated deepcopy files did not change after touching code-generator dir:"
-    echo "  ${X[*]}:-(none)"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -146,10 +152,11 @@ assert_clean
 touch vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older deepcopy "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older deepcopy "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated deepcopy files did not change after touching code-generator dep file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -158,10 +165,11 @@ assert_clean
 touch vendor/k8s.io/gengo/examples/deepcopy-gen/generators/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older deepcopy "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older deepcopy "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated deepcopy files did not change after touching code-generator dep dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -174,10 +182,11 @@ assert_clean
 touch staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older defaults "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older defaults "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated defaults files did not change after touching code-generator file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -186,10 +195,11 @@ assert_clean
 touch staging/src/k8s.io/code-generator/cmd/defaulter-gen/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older defaults "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older defaults "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated defaults files did not change after touching code-generator dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -198,10 +208,11 @@ assert_clean
 touch vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older defaults "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older defaults "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated defaults files did not change after touching code-generator dep file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -210,10 +221,11 @@ assert_clean
 touch vendor/k8s.io/gengo/examples/defaulter-gen/generators/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older defaults "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older defaults "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated defaults files did not change after touching code-generator dep dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -226,10 +238,11 @@ assert_clean
 touch staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older conversion "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older conversion "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated conversion files did not change after touching code-generator file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -238,10 +251,11 @@ assert_clean
 touch staging/src/k8s.io/code-generator/cmd/conversion-gen/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older conversion "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older conversion "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated conversion files did not change after touching code-generator dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -250,10 +264,11 @@ assert_clean
 touch vendor/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older conversion "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older conversion "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated conversion files did not change after touching code-generator dep file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -262,10 +277,11 @@ assert_clean
 touch vendor/k8s.io/code-generator/cmd/conversion-gen/generators/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older conversion "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older conversion "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated conversion files did not change after touching code-generator dep dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -278,10 +294,11 @@ assert_clean
 touch "staging/src/k8s.io/api/core/v1/types.go"
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(newer openapi "${STAMP}"))
-if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "pkg/generated/openapi/zz_generated.openapi.go" ) ]]; then
+X="$(newer openapi "${STAMP}")"
+if [[ -z "${X}" || ${X} != "./pkg/generated/openapi/zz_generated.openapi.go" ]]; then
     echo "Wrong generated openapi files changed after touching src file:"
-    echo "${X[*]:-(none)}"
+    echo "  ${X:-(none)}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -294,10 +311,11 @@ assert_clean
 touch vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older openapi "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older openapi "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated openapi files did not change after touching code-generator file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -306,10 +324,11 @@ assert_clean
 touch vendor/k8s.io/kube-openapi/cmd/openapi-gen/
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older openapi "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older openapi "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated openapi files did not change after touching code-generator dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -318,10 +337,11 @@ assert_clean
 touch vendor/k8s.io/kube-openapi/pkg/generators/openapi.go
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older openapi "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older openapi "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated openapi files did not change after touching code-generator dep file:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi
 
@@ -330,9 +350,10 @@ assert_clean
 touch vendor/k8s.io/kube-openapi/pkg/generators
 touch "${STAMP}"
 make generated_files >/dev/null
-X=($(older openapi "${STAMP}"))
-if [[ "${#X[*]}" != 0 ]]; then
+X="$(older openapi "${STAMP}")"
+if [[ -n "${X}" ]]; then
     echo "Generated openapi files did not change after touching code-generator dep dir:"
-    echo "  ${X[*]:-(none)}"
+    echo "  ${X}" | tr '\n' ' '
+    echo ""
     exit 1
 fi

hack/verify-generated-kubelet-plugin-registration.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2018 The Kubernetes Authors.
 #

hack/verify-godep-licenses.sh

@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}}
@@ -48,7 +48,7 @@ ln -s "${KUBE_ROOT}/vendor" "${_tmpdir}"
 LICENSE_ROOT="${_tmpdir}" "${KUBE_ROOT}/hack/update-godep-licenses.sh"
 
 # Compare Godep Licenses
-if ! _out="$(diff -Naupr ${KUBE_ROOT}/Godeps/LICENSES ${_tmpdir}/Godeps/LICENSES)"; then
+if ! _out="$(diff -Naupr "${KUBE_ROOT}/Godeps/LICENSES" "${_tmpdir}/Godeps/LICENSES")"; then
   echo "Your godep licenses file is out of date. Run hack/update-godep-licenses.sh and commit the results." >&2
   echo "${_out}" >&2
   exit 1

hack/verify-godeps.sh

@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}}
@@ -35,7 +35,7 @@ kube::util::ensure_godep_version
 
 if [[ -z ${TMP_GOPATH:-} ]]; then
   # Create a nice clean place to put our new godeps
-  _tmpdir="$(kube::realpath $(mktemp -d -t gopath.XXXXXX))"
+  _tmpdir="$(kube::realpath "$(mktemp -d -t gopath.XXXXXX)")"
 else
   # reuse what we might have saved previously
   _tmpdir="${TMP_GOPATH}"
@@ -58,7 +58,7 @@ trap cleanup EXIT
 _kubetmp="${_tmpdir}/src/k8s.io"
 mkdir -p "${_kubetmp}"
 # should create ${_kubectmp}/kubernetes
-git archive --format=tar --prefix=kubernetes/ $(git write-tree) | (cd "${_kubetmp}" && tar xf -)
+git archive --format=tar --prefix=kubernetes/ "$(git write-tree)" | (cd "${_kubetmp}" && tar xf -)
 _kubetmp="${_kubetmp}/kubernetes"
 
 # Do all our work in the new GOPATH
@@ -84,7 +84,7 @@ ret=0
 
 pushd "${KUBE_ROOT}" > /dev/null 2>&1
   # Test for diffs
-  if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then
+  if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' Godeps/Godeps.json "${_kubetmp}/Godeps/Godeps.json")"; then
     echo "Your Godeps.json is different:" >&2
     echo "${_out}" >&2
     echo "Godeps Verify failed." >&2
@@ -101,7 +101,7 @@ pushd "${KUBE_ROOT}" > /dev/null 2>&1
     ret=1
   fi
 
-  if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor ${_kubetmp}/vendor)"; then
+  if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor "${_kubetmp}/vendor")"; then
     echo "Your vendored results are different:" >&2
     echo "${_out}" >&2
     echo "Godeps Verify failed." >&2

hack/verify-gofmt.sh

@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 cd "${KUBE_ROOT}"
@@ -53,7 +53,7 @@ find_files() {
 # formatting (e.g., a file does not parse correctly). Without "|| true" this
 # would have led to no useful error message from gofmt, because the script would
 # have failed before getting to the "echo" in the block below.
-diff=$(find_files | xargs ${gofmt} -d -s 2>&1) || true
+diff=$(find_files | xargs "${gofmt}" -d -s 2>&1) || true
 if [[ -n "${diff}" ]]; then
   echo "${diff}" >&2
   echo >&2

hack/verify-golint.sh

@@ -20,6 +20,7 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
+source "${KUBE_ROOT}/hack/lib/util.sh"
 
 kube::golang::verify_go_version
 
@@ -49,16 +50,7 @@ array_contains () {
 
 # Check that the file is in alphabetical order
 failure_file="${KUBE_ROOT}/hack/.golint_failures"
-if ! diff -u "${failure_file}" <(LC_ALL=C sort "${failure_file}"); then
-  {
-    echo
-    echo "hack/.golint_failures is not in alphabetical order. Please sort it:"
-    echo
-    echo "  LC_ALL=C sort -o hack/.golint_failures hack/.golint_failures"
-    echo
-  } >&2
-  false
-fi
+kube::util::check-file-in-alphabetical-order "${failure_file}"
 
 export IFS=$'\n'
 # NOTE: when "go list -e ./..." is run within GOPATH, it turns the k8s.io/kubernetes

hack/verify-imports.sh

@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env

hack/verify-shellcheck.sh

@@ -20,6 +20,7 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
+source "${KUBE_ROOT}/hack/lib/util.sh"
 
 # required version for this script, if not installed on the host we will
 # use the official docker image instead. keep this in sync with SHELLCHECK_IMAGE
@@ -79,16 +80,7 @@ done < <(find . -name "*.sh" \
 
 # make sure known failures are sorted
 failure_file="${KUBE_ROOT}/hack/.shellcheck_failures"
-if ! diff -u "${failure_file}" <(LC_ALL=C sort "${failure_file}"); then
-  {
-    echo
-    echo "hack/.shellcheck_failures is not in alphabetical order. Please sort it:"
-    echo
-    echo "  LC_ALL=C sort -o hack/.shellcheck_failures hack/.shellcheck_failures"
-    echo
-  } >&2
-  false
-fi
+kube::util::check-file-in-alphabetical-order "${failure_file}"
 
 # load known failure files
 failing_files=()