Skip to content

Commit

Permalink
Fix issues with verify-imports.sh
Browse files Browse the repository at this point in the history
Change-Id: I31aa2483065a4ef6acb65c18cda73c325c432df3
  • Loading branch information
dims committed Nov 10, 2018
1 parent 3fe776f commit 3e3388b
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion hack/import-restrictions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- k8s.io/kubernetes/pkg/util
- k8s.io/api/core/v1
- k8s.io/utils/pointer
- k8s.io/klog

# the following are temporary and should go away. Think twice (or more) before adding anything here.
# Main goal: pkg/apis should be as self-contained as possible.
Expand All @@ -31,11 +32,13 @@
allowedImports:
- k8s.io/apimachinery
- k8s.io/kube-openapi
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/api/"
allowedImports:
- k8s.io/api
- k8s.io/apimachinery
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/code-generator/"
ignoredSubTrees:
Expand All @@ -44,12 +47,14 @@
- k8s.io/gengo
- k8s.io/code-generator
- k8s.io/kube-openapi
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/client-go/"
allowedImports:
- k8s.io/api
- k8s.io/apimachinery
- k8s.io/client-go
- k8s.io/klog

# prevent core machinery from taking explicit v1 references unless
# necessary
Expand All @@ -58,6 +63,7 @@
allowedImports:
- k8s.io/apimachinery
- k8s.io/client-go
- k8s.io/klog
- baseImportPath: "./vendor/k8s.io/client-go/tools/"
excludeTests: true
ignoredSubTrees:
Expand All @@ -70,7 +76,7 @@
allowedImports:
- k8s.io/apimachinery
- k8s.io/client-go

- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/apiserver/"
allowedImports:
Expand All @@ -80,13 +86,15 @@
- k8s.io/client-go
- k8s.io/kube-openapi
- k8s.io/utils
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/metrics/"
allowedImports:
- k8s.io/api
- k8s.io/apimachinery
- k8s.io/client-go
- k8s.io/metrics
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/kube-aggregator/"
allowedImports:
Expand All @@ -96,6 +104,7 @@
- k8s.io/client-go
- k8s.io/kube-aggregator
- k8s.io/kube-openapi
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/sample-apiserver/"
allowedImports:
Expand All @@ -104,6 +113,7 @@
- k8s.io/apiserver
- k8s.io/client-go
- k8s.io/sample-apiserver
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/apiextensions-apiserver/"
allowedImports:
Expand All @@ -112,12 +122,14 @@
- k8s.io/apimachinery
- k8s.io/apiserver
- k8s.io/client-go
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/kube-openapi/"
allowedImports:
- k8s.io/apimachinery
- k8s.io/kube-openapi
- k8s.io/gengo
- k8s.io/klog

- baseImportPath: "./vendor/k8s.io/sample-cli-plugin/"
allowedImports:
Expand Down Expand Up @@ -158,3 +170,4 @@
- k8s.io/api
- k8s.io/apimachinery
- k8s.io/client-go
- k8s.io/klog

0 comments on commit 3e3388b

Please sign in to comment.