Skip to content

Commit c209fe8

Browse files
committed
fix .import-restrictions to work with import-boss --include-test-files
this is mainly to ensure integration tests (which all end in _test) are properly bossed around for their imports I had to adjust some of the _test files to adhere to existing reverse_rules specified elsewhere
1 parent 81881e4 commit c209fe8

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

test/e2e/framework/.import-restrictions

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,11 @@ rules:
236236
- k8s.io/kubernetes/pkg/volume/util/subpath
237237
- k8s.io/kubernetes/pkg/volume/util/types
238238
- k8s.io/kubernetes/pkg/volume/util/volumepathhandler
239+
# TODO: I have no idea why import-boss --include-test-files is yelling about these for k8s.io/kubernetes/test/e2e/framework/providers/kubemark
240+
- k8s.io/kubernetes/pkg/apis/authentication
241+
- k8s.io/kubernetes/pkg/apis/authentication/v1
242+
- k8s.io/kubernetes/pkg/apis/certificates/v1beta1
243+
- k8s.io/kubernetes/pkg/scheduler/internal/cache
239244
- selectorRegexp: k8s[.]io/kubernetes/test/
240245
allowedPrefixes:
241246
- k8s.io/kubernetes/test/e2e/framework
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
rules:
2-
# Prevent import of k8s.io/kubernetes/test/e2e
2+
# Discourage import of k8s.io/kubernetes/test/e2e
33
- selectorRegexp: k8s[.]io/kubernetes/test/e2e
4+
# TODO: import-boss --include-test-files is catching these; drive to zero
45
allowedPrefixes:
5-
- ''
6+
# test/integration/auth/bootstraptoken_test.go is using this
7+
- k8s.io/kubernetes/test/e2e/lifecycle/bootstrap

test/integration/master/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ go_test(
3232
"//staging/src/k8s.io/api/apps/v1:go_default_library",
3333
"//staging/src/k8s.io/api/core/v1:go_default_library",
3434
"//staging/src/k8s.io/api/networking/v1:go_default_library",
35-
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library",
3635
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
3736
"//staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library",
3837
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",

test/integration/master/kube_apiserver_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131

3232
appsv1 "k8s.io/api/apps/v1"
3333
corev1 "k8s.io/api/core/v1"
34-
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
3534
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
3635
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
3736
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -157,7 +156,7 @@ func TestOpenAPIDelegationChainPlumbing(t *testing.T) {
157156
}
158157

159158
matchedExtension := false
160-
extensionsPrefix := "/apis/" + apiextensions.GroupName
159+
extensionsPrefix := "/apis/" + apiextensionsv1beta1.GroupName
161160

162161
matchedRegistration := false
163162
registrationPrefix := "/apis/" + apiregistration.GroupName

0 commit comments

Comments
 (0)