Merge pull request #20047 from tnozicka/verify-not-importing-staging

openshift-merge-robot · web-flow · commit b693fe058c89 · 2018-06-21T06:51:54.000-07:00
Verify that someone isn't accidentally importing staging
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -555,5 +555,15 @@
       "vendor/k8s.io/kubernetes/pkg/registry/rbac/reconciliation",
       "vendor/k8s.io/kubernetes/pkg/registry/rbac/validation"
     ]
+  },
+
+  {
+  "checkedPackageRoots": [
+    "github.com/openshift/origin"
+  ],
+  "forbiddenImportPackageRoots": [
+    "k8s.io/kubernetes/staging"
+  ]
   }
+
 ]

Original file line number	Diff line number	Diff line change
`@@ -555,5 +555,15 @@`
`555`	`555`	`"vendor/k8s.io/kubernetes/pkg/registry/rbac/reconciliation",`
`556`	`556`	`"vendor/k8s.io/kubernetes/pkg/registry/rbac/validation"`
`557`	`557`	`]`
	`558`	`+ },`
	`559`	`+`
	`560`	`+ {`
	`561`	`+ "checkedPackageRoots": [`
	`562`	`+ "github.com/openshift/origin"`
	`563`	`+ ],`
	`564`	`+ "forbiddenImportPackageRoots": [`
	`565`	`+ "k8s.io/kubernetes/staging"`
	`566`	`+ ]`
`558`	`567`	`}`
	`568`	`+`
`559`	`569`	`]`