mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
Merge pull request #76834 from SataQiu/fix-hack-shell-2019041905
Fix bug and golint failures of hack/verify-api-groups.sh
This commit is contained in:
commit
dc395391bc
@ -37,7 +37,6 @@
|
|||||||
./hack/pin-dependency.sh
|
./hack/pin-dependency.sh
|
||||||
./hack/test-integration.sh
|
./hack/test-integration.sh
|
||||||
./hack/update-vendor.sh
|
./hack/update-vendor.sh
|
||||||
./hack/verify-api-groups.sh
|
|
||||||
./hack/verify-boilerplate.sh
|
./hack/verify-boilerplate.sh
|
||||||
./hack/verify-cli-conventions.sh
|
./hack/verify-cli-conventions.sh
|
||||||
./hack/verify-codegen.sh
|
./hack/verify-codegen.sh
|
||||||
|
@ -21,7 +21,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"
|
||||||
prefix="${KUBE_ROOT%"k8s.io/kubernetes"}"
|
prefix="${KUBE_ROOT%"k8s.io/kubernetes"}"
|
||||||
|
|
||||||
@ -98,7 +98,6 @@ packages_without_install=(
|
|||||||
)
|
)
|
||||||
known_version_files=(
|
known_version_files=(
|
||||||
"pkg/master/import_known_versions.go"
|
"pkg/master/import_known_versions.go"
|
||||||
"pkg/client/clientset_generated/internal_clientset/import_known_versions.go"
|
|
||||||
)
|
)
|
||||||
for expected_install_package in "${expected_install_packages[@]}"; do
|
for expected_install_package in "${expected_install_packages[@]}"; do
|
||||||
found=0
|
found=0
|
||||||
@ -112,8 +111,8 @@ for expected_install_package in "${expected_install_packages[@]}"; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
for known_version_file in "${known_version_files[@]}"; do
|
for known_version_file in "${known_version_files[@]}"; do
|
||||||
if ! grep -q "${expected_install_package}/install" ${known_version_files} ; then
|
if ! grep -q "${expected_install_package}/install" "${known_version_file}" ; then
|
||||||
echo "missing ${expected_install_package}/install from ${known_version_files}"
|
echo "missing ${expected_install_package}/install from ${known_version_file}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user