From 668a28859539415b34bb5facceec2c1387114295 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Sun, 7 Apr 2019 12:08:41 -0700 Subject: [PATCH 1/2] Remove unneeded scripts --- Godeps/Readme | 5 ----- hack/make-rules/verify.sh | 2 -- hack/verify-godep-licenses.sh | 23 ----------------------- hack/verify-godeps.sh | 23 ----------------------- 4 files changed, 53 deletions(-) delete mode 100644 Godeps/Readme delete mode 100755 hack/verify-godep-licenses.sh delete mode 100755 hack/verify-godeps.sh diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d56..0000000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/hack/make-rules/verify.sh b/hack/make-rules/verify.sh index a3e8042331..06f1ce0dec 100755 --- a/hack/make-rules/verify.sh +++ b/hack/make-rules/verify.sh @@ -48,8 +48,6 @@ fi # Exclude vendor checks in certain cases, if they're running in a separate job. if [[ ${EXCLUDE_GODEP:-} =~ ^[yY]$ ]]; then EXCLUDED_PATTERNS+=( - "verify-godeps.sh" # runs in separate godeps job - "verify-godeps-licenses.sh" # runs in separate godeps job "verify-vendor.sh" # runs in separate godeps job "verify-vendor-licenses.sh" # runs in separate godeps job ) diff --git a/hack/verify-godep-licenses.sh b/hack/verify-godep-licenses.sh deleted file mode 100755 index 609eba4fab..0000000000 --- a/hack/verify-godep-licenses.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2015 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -echo "Deprecated, use verify-vendor-licenses.sh instead" -"${KUBE_ROOT}/hack/verify-vendor-licenses.sh" "$@" diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh deleted file mode 100755 index f016302cee..0000000000 --- a/hack/verify-godeps.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2015 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -echo "Deprecated, use verify-vendor.sh instead" -"${KUBE_ROOT}/hack/verify-vendor.sh" "$@" From 2363136f2cf46909b1cebbd3c747a04b2c2477f1 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Sun, 7 Apr 2019 12:11:18 -0700 Subject: [PATCH 2/2] Remove has_changes logic from vendor scripts --- hack/verify-vendor-licenses.sh | 11 +---------- hack/verify-vendor.sh | 27 +++++++-------------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/hack/verify-vendor-licenses.sh b/hack/verify-vendor-licenses.sh index 8aea7de80d..3f0ee540d1 100755 --- a/hack/verify-vendor-licenses.sh +++ b/hack/verify-vendor-licenses.sh @@ -21,15 +21,6 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}} -if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \ - ! kube::util::has_changes "${branch}" 'Godeps/' && \ - ! kube::util::has_changes "${branch}" 'go.mod' && \ - ! kube::util::has_changes "${branch}" 'go.sum' && \ - ! kube::util::has_changes "${branch}" 'vendor/'; then - exit 0 -fi - # create a nice clean place to put our new licenses # must be in the user dir (e.g. KUBE_ROOT) in order for the docker volume mount # to work with docker-machine on macs @@ -40,7 +31,7 @@ function cleanup { #echo "Removing workspace: ${_tmpdir}" rm -rf "${_tmpdir}" } -trap cleanup EXIT +kube::util::trap_add cleanup EXIT cp -r "${KUBE_ROOT}/Godeps" "${_tmpdir}/Godeps" ln -s "${KUBE_ROOT}/LICENSE" "${_tmpdir}" diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh index 5595c8b7aa..676d706f85 100755 --- a/hack/verify-vendor.sh +++ b/hack/verify-vendor.sh @@ -21,29 +21,16 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}} -if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \ - ! kube::util::has_changes "${branch}" 'Godeps/' && \ - ! kube::util::has_changes "${branch}" 'go.mod' && \ - ! kube::util::has_changes "${branch}" 'go.sum' && \ - ! kube::util::has_changes "${branch}" 'vendor/' && \ - ! kube::util::has_changes "${branch}" 'staging/' && \ - ! kube::util::has_changes "${branch}" 'hack/lib/' && \ - ! kube::util::has_changes "${branch}" 'hack/.*vendor'; then - exit 0 -fi - -if [[ -z ${TMP_GOPATH:-} ]]; then - # Create a nice clean place to put our new vendor - _tmpdir="$(kube::realpath "$(mktemp -d -t verifyvendor.XXXXXX)")" -else - # reuse what we might have saved previously - _tmpdir="${TMP_GOPATH}" -fi +# create a nice clean place to put our new licenses +# must be in the user dir (e.g. KUBE_ROOT) in order for the docker volume mount +# to work with docker-machine on macs +mkdir -p "${KUBE_ROOT}/_tmp" +_tmpdir="$(mktemp -d "${KUBE_ROOT}/_tmp/kube-vendor.XXXXXX")" if [[ -z ${KEEP_TMP:-} ]]; then KEEP_TMP=false fi + function cleanup { # make go module dirs writeable chmod -R +w "${_tmpdir}" @@ -54,7 +41,7 @@ function cleanup { rm -rf "${_tmpdir}" fi } -trap cleanup EXIT +kube::util::trap_add cleanup EXIT # Copy the contents of the kube directory into the nice clean place (which is NOT shaped like a GOPATH) _kubetmp="${_tmpdir}"