diff --git a/hack/verify-generated-protobuf.sh b/hack/verify-generated-protobuf.sh index 76185f8c8dc..e9a90a74b8d 100755 --- a/hack/verify-generated-protobuf.sh +++ b/hack/verify-generated-protobuf.sh @@ -54,7 +54,7 @@ for APIROOT in ${APIROOTS}; do TMP_APIROOT="${_tmp}/${APIROOT}" echo "diffing ${APIROOT} against freshly generated protobuf" ret=0 - diff -Naupr -I 'Auto generated by' -x 'zz_generated.*' -x '.github' "${KUBE_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$? + diff -Naupr -I 'Auto generated by' -x 'zz_generated.*' -x '.github' -x '.import-restrictions' "${KUBE_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$? cp -a "${TMP_APIROOT}"/* "${KUBE_ROOT}/${APIROOT}/" if [[ $ret -eq 0 ]]; then echo "${APIROOT} up to date." diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh index e159916fd20..bafb9d71e4d 100755 --- a/hack/verify-import-boss.sh +++ b/hack/verify-import-boss.sh @@ -30,4 +30,11 @@ kube::golang::setup_env make -C "${KUBE_ROOT}" WHAT=vendor/k8s.io/code-generator/cmd/import-boss -$(kube::util::find-binary "import-boss") --verify-only "$@" +packages=("k8s.io/kubernetes/pkg/..." "k8s.io/kubernetes/cmd/..." "k8s.io/kubernetes/plugin/..." "k8s.io/kubernetes/test/e2e/framework/...") +for d in staging/src/k8s.io/*/; do + if [ -d "$d" ]; then + packages+=("./vendor/${d#"staging/src/"}...") + fi +done + +$(kube::util::find-binary "import-boss") --verify-only "$@" --input-dirs "$(IFS=, ; echo "${packages[*]}")" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go b/staging/src/k8s.io/code-generator/cmd/import-boss/main.go index e08f3e73036..9d73eb480b5 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go +++ b/staging/src/k8s.io/code-generator/cmd/import-boss/main.go @@ -77,12 +77,6 @@ func main() { // Override defaults. arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath()) - arguments.InputDirs = []string{ - "k8s.io/kubernetes/pkg/...", - "k8s.io/kubernetes/cmd/...", - "k8s.io/kubernetes/plugin/...", - "k8s.io/kubernetes/test/e2e/framework/...", - } pflag.CommandLine.BoolVar(&arguments.IncludeTestFiles, "include-test-files", false, "If true, include *_test.go files.") if err := arguments.Execute(