github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

fix .import-restrictions to work with import-boss --include-test-files

Browse Source 
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
This commit is contained in:
Aaron Crickenberger 2020-04-22 15:41:00 -07:00
parent 81881e4a12
commit c209fe8439
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/.import-restrictions
View File

@ -236,6 +236,11 @@ rules:
- k8s.io/kubernetes/pkg/volume/util/subpath - k8s.io/kubernetes/pkg/volume/util/subpath
- k8s.io/kubernetes/pkg/volume/util/types - k8s.io/kubernetes/pkg/volume/util/types
- k8s.io/kubernetes/pkg/volume/util/volumepathhandler - k8s.io/kubernetes/pkg/volume/util/volumepathhandler
# TODO: I have no idea why import-boss --include-test-files is yelling about these for k8s.io/kubernetes/test/e2e/framework/providers/kubemark
- k8s.io/kubernetes/pkg/apis/authentication
- k8s.io/kubernetes/pkg/apis/authentication/v1
- k8s.io/kubernetes/pkg/apis/certificates/v1beta1
- k8s.io/kubernetes/pkg/scheduler/internal/cache
- selectorRegexp: k8s[.]io/kubernetes/test/ - selectorRegexp: k8s[.]io/kubernetes/test/
allowedPrefixes: allowedPrefixes:
- k8s.io/kubernetes/test/e2e/framework - k8s.io/kubernetes/test/e2e/framework

6
test/integration/.import-restrictions
View File

@ -1,5 +1,7 @@
rules: rules:
# Prevent import of k8s.io/kubernetes/test/e2e # Discourage import of k8s.io/kubernetes/test/e2e
- selectorRegexp: k8s[.]io/kubernetes/test/e2e - selectorRegexp: k8s[.]io/kubernetes/test/e2e
# TODO: import-boss --include-test-files is catching these; drive to zero
allowedPrefixes: allowedPrefixes:
- '' # test/integration/auth/bootstraptoken_test.go is using this
- k8s.io/kubernetes/test/e2e/lifecycle/bootstrap

1
test/integration/master/BUILD
View File

@ -32,7 +32,6 @@ go_test(
"//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/networking/v1:go_default_library", "//staging/src/k8s.io/api/networking/v1:go_default_library",
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library",
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
"//staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",

3
test/integration/master/kube_apiserver_test.go
View File

@ -31,7 +31,6 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -157,7 +156,7 @@ func TestOpenAPIDelegationChainPlumbing(t *testing.T) {
} }
matchedExtension := false matchedExtension := false
extensionsPrefix := "/apis/" + apiextensions.GroupName extensionsPrefix := "/apis/" + apiextensionsv1beta1.GroupName
matchedRegistration := false matchedRegistration := false
registrationPrefix := "/apis/" + apiregistration.GroupName registrationPrefix := "/apis/" + apiregistration.GroupName