From bb90f0ff94da518439be94b56e682acbfd9abaf7 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 13 Dec 2019 10:17:12 -0500 Subject: [PATCH] Install APIs directly for tests --- pkg/apis/core/v1/BUILD | 3 ++- pkg/apis/core/v1/conversion_test.go | 8 +++++--- pkg/apis/core/v1/defaults_test.go | 13 ++++++------- pkg/apis/core/validation/BUILD | 1 - pkg/apis/core/validation/validation_test.go | 1 - pkg/apis/scheduling/v1/BUILD | 2 +- pkg/apis/scheduling/v1/defaults_test.go | 12 ++++++------ pkg/apis/scheduling/v1alpha1/BUILD | 2 +- pkg/apis/scheduling/v1alpha1/defaults_test.go | 10 +++++----- pkg/apis/scheduling/v1beta1/BUILD | 2 +- pkg/apis/scheduling/v1beta1/defaults_test.go | 10 +++++----- pkg/registry/core/event/BUILD | 2 +- pkg/registry/core/event/strategy_test.go | 4 ++-- pkg/registry/core/limitrange/storage/BUILD | 1 + .../core/limitrange/storage/storage_test.go | 1 + pkg/registry/core/namespace/BUILD | 2 +- pkg/registry/core/namespace/strategy_test.go | 4 ++-- pkg/registry/core/node/BUILD | 2 +- pkg/registry/core/node/strategy_test.go | 9 ++++----- pkg/registry/core/persistentvolume/BUILD | 2 +- pkg/registry/core/persistentvolume/strategy_test.go | 4 ++-- pkg/registry/core/persistentvolumeclaim/BUILD | 2 +- .../core/persistentvolumeclaim/strategy_test.go | 4 ++-- pkg/registry/core/pod/BUILD | 2 +- pkg/registry/core/pod/rest/BUILD | 1 + pkg/registry/core/pod/rest/log.go | 1 + pkg/registry/core/pod/strategy_test.go | 4 ++-- pkg/registry/core/replicationcontroller/BUILD | 2 +- .../core/replicationcontroller/strategy_test.go | 4 ++-- pkg/registry/core/secret/BUILD | 2 +- pkg/registry/core/secret/strategy_test.go | 4 ++-- pkg/registry/core/service/allocator/storage/BUILD | 1 + .../core/service/allocator/storage/storage.go | 1 + pkg/registry/core/service/ipallocator/storage/BUILD | 1 + .../service/ipallocator/storage/storage_test.go | 1 + pkg/registry/networking/ingress/storage/BUILD | 2 ++ .../networking/ingress/storage/storage_test.go | 2 ++ pkg/registry/networking/networkpolicy/storage/BUILD | 1 + .../networkpolicy/storage/storage_test.go | 1 + pkg/registry/registrytest/BUILD | 1 - pkg/registry/settings/podpreset/storage/BUILD | 1 + .../settings/podpreset/storage/storage_test.go | 1 + 42 files changed, 74 insertions(+), 60 deletions(-) diff --git a/pkg/apis/core/v1/BUILD b/pkg/apis/core/v1/BUILD index 53cdd374782..8543d8a01a0 100644 --- a/pkg/apis/core/v1/BUILD +++ b/pkg/apis/core/v1/BUILD @@ -41,10 +41,11 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/api/testapi:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/apps/install:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/core/fuzzer:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/features:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/apis/core/v1/conversion_test.go b/pkg/apis/core/v1/conversion_test.go index aee9c2c8994..32a96754f2a 100644 --- a/pkg/apis/core/v1/conversion_test.go +++ b/pkg/apis/core/v1/conversion_test.go @@ -25,7 +25,7 @@ import ( "time" appsv1 "k8s.io/api/apps/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" @@ -40,8 +40,10 @@ import ( corev1 "k8s.io/kubernetes/pkg/apis/core/v1" utilpointer "k8s.io/utils/pointer" - // enforce that all types are installed - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" + // ensure types are installed corereplicationcontroller<->replicaset conversions + _ "k8s.io/kubernetes/pkg/apis/apps/install" ) func TestPodLogOptions(t *testing.T) { diff --git a/pkg/apis/core/v1/defaults_test.go b/pkg/apis/core/v1/defaults_test.go index 4e0a9d93586..9761b67b17f 100644 --- a/pkg/apis/core/v1/defaults_test.go +++ b/pkg/apis/core/v1/defaults_test.go @@ -29,16 +29,15 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/kubernetes/pkg/api/legacyscheme" - corev1 "k8s.io/kubernetes/pkg/apis/core/v1" - utilpointer "k8s.io/utils/pointer" - - // enforce that all types are installed - _ "k8s.io/kubernetes/pkg/api/testapi" - utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/kubernetes/pkg/api/legacyscheme" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/features" + utilpointer "k8s.io/utils/pointer" + + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) // TestWorkloadDefaults detects changes to defaults within PodTemplateSpec. diff --git a/pkg/apis/core/validation/BUILD b/pkg/apis/core/validation/BUILD index 2db631180e6..024c3632d9e 100644 --- a/pkg/apis/core/validation/BUILD +++ b/pkg/apis/core/validation/BUILD @@ -54,7 +54,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/features:go_default_library", diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index f7b4377bda9..8ba68da00fe 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -32,7 +32,6 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" - _ "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/features" diff --git a/pkg/apis/scheduling/v1/BUILD b/pkg/apis/scheduling/v1/BUILD index 1624bb9802c..a3c74753cf7 100644 --- a/pkg/apis/scheduling/v1/BUILD +++ b/pkg/apis/scheduling/v1/BUILD @@ -49,8 +49,8 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/api/testapi:go_default_library", "//pkg/apis/scheduling:go_default_library", + "//pkg/apis/scheduling/install:go_default_library", "//pkg/features:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/scheduling/v1:go_default_library", diff --git a/pkg/apis/scheduling/v1/defaults_test.go b/pkg/apis/scheduling/v1/defaults_test.go index 129d069be5b..aa11406e759 100644 --- a/pkg/apis/scheduling/v1/defaults_test.go +++ b/pkg/apis/scheduling/v1/defaults_test.go @@ -20,16 +20,16 @@ import ( "reflect" "testing" - "k8s.io/api/scheduling/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/api/legacyscheme" - apiv1 "k8s.io/api/core/v1" + v1 "k8s.io/api/scheduling/v1" + "k8s.io/apimachinery/pkg/runtime" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" - // enforce that all types are installed - _ "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/features" + + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/scheduling/install" ) func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { diff --git a/pkg/apis/scheduling/v1alpha1/BUILD b/pkg/apis/scheduling/v1alpha1/BUILD index fb59ce663d6..7ea479b77b6 100644 --- a/pkg/apis/scheduling/v1alpha1/BUILD +++ b/pkg/apis/scheduling/v1alpha1/BUILD @@ -44,7 +44,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/api/testapi:go_default_library", + "//pkg/apis/scheduling/install:go_default_library", "//pkg/features:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/scheduling/v1alpha1:go_default_library", diff --git a/pkg/apis/scheduling/v1alpha1/defaults_test.go b/pkg/apis/scheduling/v1alpha1/defaults_test.go index 574b4645425..ce62c585977 100644 --- a/pkg/apis/scheduling/v1alpha1/defaults_test.go +++ b/pkg/apis/scheduling/v1alpha1/defaults_test.go @@ -20,16 +20,16 @@ import ( "reflect" "testing" + apiv1 "k8s.io/api/core/v1" "k8s.io/api/scheduling/v1alpha1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/api/legacyscheme" - - apiv1 "k8s.io/api/core/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" - // enforce that all types are installed - _ "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/features" + + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/scheduling/install" ) func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { diff --git a/pkg/apis/scheduling/v1beta1/BUILD b/pkg/apis/scheduling/v1beta1/BUILD index ac56ec19ad9..33eb9ed0bc0 100644 --- a/pkg/apis/scheduling/v1beta1/BUILD +++ b/pkg/apis/scheduling/v1beta1/BUILD @@ -44,7 +44,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/api/testapi:go_default_library", + "//pkg/apis/scheduling/install:go_default_library", "//pkg/features:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/scheduling/v1beta1:go_default_library", diff --git a/pkg/apis/scheduling/v1beta1/defaults_test.go b/pkg/apis/scheduling/v1beta1/defaults_test.go index f758a717eb2..d1166c141d3 100644 --- a/pkg/apis/scheduling/v1beta1/defaults_test.go +++ b/pkg/apis/scheduling/v1beta1/defaults_test.go @@ -20,16 +20,16 @@ import ( "reflect" "testing" + apiv1 "k8s.io/api/core/v1" "k8s.io/api/scheduling/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/api/legacyscheme" - - apiv1 "k8s.io/api/core/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" - // enforce that all types are installed - _ "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/features" + + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/scheduling/install" ) func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { diff --git a/pkg/registry/core/event/BUILD b/pkg/registry/core/event/BUILD index e001271d41c..7306c1ad42e 100644 --- a/pkg/registry/core/event/BUILD +++ b/pkg/registry/core/event/BUILD @@ -33,9 +33,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", diff --git a/pkg/registry/core/event/strategy_test.go b/pkg/registry/core/event/strategy_test.go index 62031ec6649..639257c713f 100644 --- a/pkg/registry/core/event/strategy_test.go +++ b/pkg/registry/core/event/strategy_test.go @@ -26,8 +26,8 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" api "k8s.io/kubernetes/pkg/apis/core" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestGetAttrs(t *testing.T) { diff --git a/pkg/registry/core/limitrange/storage/BUILD b/pkg/registry/core/limitrange/storage/BUILD index c8fe6aa9eeb..bb26c966448 100644 --- a/pkg/registry/core/limitrange/storage/BUILD +++ b/pkg/registry/core/limitrange/storage/BUILD @@ -12,6 +12,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/registry/registrytest:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/registry/core/limitrange/storage/storage_test.go b/pkg/registry/core/limitrange/storage/storage_test.go index 7a4fedede2c..3bbcad7f5e3 100644 --- a/pkg/registry/core/limitrange/storage/storage_test.go +++ b/pkg/registry/core/limitrange/storage/storage_test.go @@ -28,6 +28,7 @@ import ( genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" api "k8s.io/kubernetes/pkg/apis/core" + _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index 7f6f7deb66e..91f138f146b 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -32,9 +32,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library", ], diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index 45982ad686b..767077f5b1a 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -24,8 +24,8 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" api "k8s.io/kubernetes/pkg/apis/core" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestNamespaceStrategy(t *testing.T) { diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index c2e8d0eb5d1..d12439d40c0 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -40,9 +40,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/features:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/registry/core/node/strategy_test.go b/pkg/registry/core/node/strategy_test.go index 80dc00eee8e..198ea59b183 100644 --- a/pkg/registry/core/node/strategy_test.go +++ b/pkg/registry/core/node/strategy_test.go @@ -23,15 +23,14 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/diff" - apitesting "k8s.io/kubernetes/pkg/api/testing" - api "k8s.io/kubernetes/pkg/apis/core" - utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + apitesting "k8s.io/kubernetes/pkg/api/testing" + api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestMatchNode(t *testing.T) { diff --git a/pkg/registry/core/persistentvolume/BUILD b/pkg/registry/core/persistentvolume/BUILD index b66a2a98418..2369e2ce8c4 100644 --- a/pkg/registry/core/persistentvolume/BUILD +++ b/pkg/registry/core/persistentvolume/BUILD @@ -34,9 +34,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", ], ) diff --git a/pkg/registry/core/persistentvolume/strategy_test.go b/pkg/registry/core/persistentvolume/strategy_test.go index 91d95db68f1..3aac0d1612a 100644 --- a/pkg/registry/core/persistentvolume/strategy_test.go +++ b/pkg/registry/core/persistentvolume/strategy_test.go @@ -22,8 +22,8 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" api "k8s.io/kubernetes/pkg/apis/core" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestSelectableFieldLabelConversions(t *testing.T) { diff --git a/pkg/registry/core/persistentvolumeclaim/BUILD b/pkg/registry/core/persistentvolumeclaim/BUILD index f2f5b03e925..08052378aba 100644 --- a/pkg/registry/core/persistentvolumeclaim/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/BUILD @@ -35,9 +35,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/features:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library", diff --git a/pkg/registry/core/persistentvolumeclaim/strategy_test.go b/pkg/registry/core/persistentvolumeclaim/strategy_test.go index 863079f47b9..7dd07bcd42e 100644 --- a/pkg/registry/core/persistentvolumeclaim/strategy_test.go +++ b/pkg/registry/core/persistentvolumeclaim/strategy_test.go @@ -29,8 +29,8 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestSelectableFieldLabelConversions(t *testing.T) { diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index fcbd93c06ba..3bffa38009e 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -42,9 +42,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/kubelet/client:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/registry/core/pod/rest/BUILD b/pkg/registry/core/pod/rest/BUILD index b55a736e764..e61a2ff13cf 100644 --- a/pkg/registry/core/pod/rest/BUILD +++ b/pkg/registry/core/pod/rest/BUILD @@ -15,6 +15,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/registry/core/pod/rest", deps = [ "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/apis/core/validation:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/features:go_default_library", diff --git a/pkg/registry/core/pod/rest/log.go b/pkg/registry/core/pod/rest/log.go index c7fb99b79c3..d4d43750ff1 100644 --- a/pkg/registry/core/pod/rest/log.go +++ b/pkg/registry/core/pod/rest/log.go @@ -27,6 +27,7 @@ import ( "k8s.io/apiserver/pkg/registry/rest" utilfeature "k8s.io/apiserver/pkg/util/feature" api "k8s.io/kubernetes/pkg/apis/core" + _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/apis/core/validation" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/client" diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index f6ccd9c3acd..39d94bd7667 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -35,8 +35,8 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/kubelet/client" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestMatchPod(t *testing.T) { diff --git a/pkg/registry/core/replicationcontroller/BUILD b/pkg/registry/core/replicationcontroller/BUILD index cfc09d1b4d9..1586a9a18d8 100644 --- a/pkg/registry/core/replicationcontroller/BUILD +++ b/pkg/registry/core/replicationcontroller/BUILD @@ -39,9 +39,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library", ], diff --git a/pkg/registry/core/replicationcontroller/strategy_test.go b/pkg/registry/core/replicationcontroller/strategy_test.go index 36867ceb6f8..252def3201a 100644 --- a/pkg/registry/core/replicationcontroller/strategy_test.go +++ b/pkg/registry/core/replicationcontroller/strategy_test.go @@ -25,8 +25,8 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" api "k8s.io/kubernetes/pkg/apis/core" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestControllerStrategy(t *testing.T) { diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index dcf68c9b754..4c88ba54abd 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -34,9 +34,9 @@ go_test( srcs = ["strategy_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library", diff --git a/pkg/registry/core/secret/strategy_test.go b/pkg/registry/core/secret/strategy_test.go index f54d5e295aa..d942e26f130 100644 --- a/pkg/registry/core/secret/strategy_test.go +++ b/pkg/registry/core/secret/strategy_test.go @@ -26,8 +26,8 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" api "k8s.io/kubernetes/pkg/apis/core" - // install all api groups for testing - _ "k8s.io/kubernetes/pkg/api/testapi" + // ensure types are installed + _ "k8s.io/kubernetes/pkg/apis/core/install" ) func TestExportSecret(t *testing.T) { diff --git a/pkg/registry/core/service/allocator/storage/BUILD b/pkg/registry/core/service/allocator/storage/BUILD index fcc0b313ecf..49eadbe9ad1 100644 --- a/pkg/registry/core/service/allocator/storage/BUILD +++ b/pkg/registry/core/service/allocator/storage/BUILD @@ -25,6 +25,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage", deps = [ "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/registry/core/rangeallocation:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/registry/core/service/allocator/storage/storage.go b/pkg/registry/core/service/allocator/storage/storage.go index 2af9ecd355c..dfa2231fe3e 100644 --- a/pkg/registry/core/service/allocator/storage/storage.go +++ b/pkg/registry/core/service/allocator/storage/storage.go @@ -31,6 +31,7 @@ import ( storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/apiserver/pkg/storage/storagebackend" api "k8s.io/kubernetes/pkg/apis/core" + _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" "k8s.io/kubernetes/pkg/registry/core/service/allocator" ) diff --git a/pkg/registry/core/service/ipallocator/storage/BUILD b/pkg/registry/core/service/ipallocator/storage/BUILD index 1596e2e9567..3614155d1c1 100644 --- a/pkg/registry/core/service/ipallocator/storage/BUILD +++ b/pkg/registry/core/service/ipallocator/storage/BUILD @@ -12,6 +12,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/core:go_default_library", + "//pkg/apis/core/install:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", "//pkg/registry/core/service/allocator/storage:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", diff --git a/pkg/registry/core/service/ipallocator/storage/storage_test.go b/pkg/registry/core/service/ipallocator/storage/storage_test.go index defbb8e3cdb..763680d81c1 100644 --- a/pkg/registry/core/service/ipallocator/storage/storage_test.go +++ b/pkg/registry/core/service/ipallocator/storage/storage_test.go @@ -27,6 +27,7 @@ import ( etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/apiserver/pkg/storage/storagebackend/factory" api "k8s.io/kubernetes/pkg/apis/core" + _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/registry/core/service/allocator" allocatorstore "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" diff --git a/pkg/registry/networking/ingress/storage/BUILD b/pkg/registry/networking/ingress/storage/BUILD index 6b5ea3fa4b4..ae7e9787afe 100644 --- a/pkg/registry/networking/ingress/storage/BUILD +++ b/pkg/registry/networking/ingress/storage/BUILD @@ -12,7 +12,9 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/core:go_default_library", + "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/networking:go_default_library", + "//pkg/apis/networking/install:go_default_library", "//pkg/registry/registrytest:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/pkg/registry/networking/ingress/storage/storage_test.go b/pkg/registry/networking/ingress/storage/storage_test.go index 79483b09767..45be3041a8f 100644 --- a/pkg/registry/networking/ingress/storage/storage_test.go +++ b/pkg/registry/networking/ingress/storage/storage_test.go @@ -28,7 +28,9 @@ import ( genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" api "k8s.io/kubernetes/pkg/apis/core" + _ "k8s.io/kubernetes/pkg/apis/extensions/install" "k8s.io/kubernetes/pkg/apis/networking" + _ "k8s.io/kubernetes/pkg/apis/networking/install" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/networking/networkpolicy/storage/BUILD b/pkg/registry/networking/networkpolicy/storage/BUILD index cf47993d70b..6191ff89c54 100644 --- a/pkg/registry/networking/networkpolicy/storage/BUILD +++ b/pkg/registry/networking/networkpolicy/storage/BUILD @@ -43,6 +43,7 @@ go_test( deps = [ "//pkg/apis/core:go_default_library", "//pkg/apis/networking:go_default_library", + "//pkg/apis/networking/install:go_default_library", "//pkg/registry/registrytest:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/pkg/registry/networking/networkpolicy/storage/storage_test.go b/pkg/registry/networking/networkpolicy/storage/storage_test.go index e1dea17e585..611f8db8905 100644 --- a/pkg/registry/networking/networkpolicy/storage/storage_test.go +++ b/pkg/registry/networking/networkpolicy/storage/storage_test.go @@ -29,6 +29,7 @@ import ( etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/networking" + _ "k8s.io/kubernetes/pkg/apis/networking/install" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 46f75f277bd..2c2e1a75073 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -19,7 +19,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/registry/registrytest", deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/util/slice:go_default_library", diff --git a/pkg/registry/settings/podpreset/storage/BUILD b/pkg/registry/settings/podpreset/storage/BUILD index 44ea87a357b..eddc3e03bb0 100644 --- a/pkg/registry/settings/podpreset/storage/BUILD +++ b/pkg/registry/settings/podpreset/storage/BUILD @@ -39,6 +39,7 @@ go_test( deps = [ "//pkg/apis/core:go_default_library", "//pkg/apis/settings:go_default_library", + "//pkg/apis/settings/install:go_default_library", "//pkg/registry/registrytest:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/pkg/registry/settings/podpreset/storage/storage_test.go b/pkg/registry/settings/podpreset/storage/storage_test.go index b15cc84c0b7..04d372f6573 100644 --- a/pkg/registry/settings/podpreset/storage/storage_test.go +++ b/pkg/registry/settings/podpreset/storage/storage_test.go @@ -28,6 +28,7 @@ import ( etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/settings" + _ "k8s.io/kubernetes/pkg/apis/settings/install" "k8s.io/kubernetes/pkg/registry/registrytest" )