Merge pull request #54557 from sttts/sttts-import-restrictions

Automatic merge from submit-queue (batch tested with PRs 54399, 54557, 54506). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. hack: rename verify-{staging- -> }imports.sh The import-verify mechanism is very helpful in restricting imports on a long way towards splitting out something into a staging repo. Obviously, during that time it's not about staging repos. This PR renames the verify script and config for that reality.

Merge pull request #54557 from sttts/sttts-import-restrictions
fe6ddf3a · Kubernetes Submit Queue · GitHub · 7b588817 · d51d7fd2 · fe6ddf3a
Commit fe6ddf3a authored Oct 25, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

import-restrictions.json hack/import-restrictions.json +0 -0

verify.sh hack/make-rules/verify.sh +1 -1

verify-imports.sh hack/verify-imports.sh +1 -2

No files found.
--- a/hack/staging-import-restrictions.json
+++ b/hack/staging-import-restrictions.json
--- a/hack/make-rules/verify.sh
+++ b/hack/make-rules/verify.sh
@@ -39,10 +39,10 @@ QUICK_PATTERNS+=(
  "verify-generated-files-remake"
  "verify-godep-licenses.sh"
  "verify-gofmt.sh"
+  "verify-imports.sh"
  "verify-pkg-names.sh"
  "verify-readonly-packages.sh"
  "verify-staging-client-go.sh"
-  "verify-staging-imports.sh"
  "verify-test-images.sh"
  "verify-test-owners.sh"
 )

--- a/hack/verify-staging-imports.sh
+++ b/hack/verify-staging-imports.sh
@@ -38,4 +38,4 @@ if [[ ! -x "$importverifier" ]]; then
  exit 1
 fi
-"${importverifier}" "k8s.io/" "${KUBE_ROOT}/hack/staging-import-restrictions.json"
+"${importverifier}" "k8s.io/" "${KUBE_ROOT}/hack/import-restrictions.json"
\ No newline at end of file