diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 943cf8e382a..d7455abf14a 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -20,6 +20,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/install:go_default_library", "//pkg/api/v1/helper:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/api/v1/ref:go_default_library", diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 82b0c518d1a..fb532111d85 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -43,6 +43,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" + _ "k8s.io/kubernetes/pkg/api/install" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/ref" diff --git a/pkg/controller/cronjob/BUILD b/pkg/controller/cronjob/BUILD index 0cc8c4c042c..7380d32bdb9 100644 --- a/pkg/controller/cronjob/BUILD +++ b/pkg/controller/cronjob/BUILD @@ -51,6 +51,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api/install:go_default_library", + "//pkg/apis/batch/install:go_default_library", "//pkg/controller:go_default_library", "//vendor/k8s.io/api/batch/v1:go_default_library", "//vendor/k8s.io/api/batch/v2alpha1:go_default_library", diff --git a/pkg/controller/cronjob/cronjob_controller_test.go b/pkg/controller/cronjob/cronjob_controller_test.go index ef1b80d66b8..4e3a0feee2a 100644 --- a/pkg/controller/cronjob/cronjob_controller_test.go +++ b/pkg/controller/cronjob/cronjob_controller_test.go @@ -29,6 +29,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" + // For the cronjob controller to do conversions. + _ "k8s.io/kubernetes/pkg/api/install" + _ "k8s.io/kubernetes/pkg/apis/batch/install" "k8s.io/kubernetes/pkg/controller" ) diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index 7a69a586e51..2d8497cd4c4 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -47,6 +47,7 @@ go_library( "//vendor/k8s.io/client-go/informers/core/v1:go_default_library", "//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/listers/apps/v1beta1:go_default_library", diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 59affc7953a..d385e8bb068 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -38,6 +38,7 @@ import ( coreinformers "k8s.io/client-go/informers/core/v1" extensionsinformers "k8s.io/client-go/informers/extensions/v1beta1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" unversionedextensions "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" appslisters "k8s.io/client-go/listers/apps/v1beta1" @@ -864,7 +865,7 @@ func storeDaemonSetStatus(dsClient unversionedextensions.DaemonSetInterface, ds return nil } - clone, err := api.Scheme.DeepCopy(ds) + clone, err := scheme.Scheme.DeepCopy(ds) if err != nil { return err } diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 1fca5de5944..7c5e8ca64a4 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -44,6 +44,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/apis/extensions/install:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go index 5ae6d8f0e0d..825d9fd74f6 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go @@ -31,6 +31,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" + // For api.Registry.RESTMapper() + _ "k8s.io/kubernetes/pkg/apis/extensions/install" metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake" cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake" diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 6bdea78b368..f7e81cb3720 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -32,6 +32,7 @@ go_library( "//vendor/k8s.io/client-go/informers/core/v1:go_default_library", "//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/listers/core/v1:go_default_library", diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 2a60ae3e98a..de395157f5c 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -38,6 +38,7 @@ import ( coreinformers "k8s.io/client-go/informers/core/v1" extensionsinformers "k8s.io/client-go/informers/extensions/v1beta1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" corelisters "k8s.io/client-go/listers/core/v1" extensionslisters "k8s.io/client-go/listers/extensions/v1beta1" @@ -597,7 +598,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(key string) error { manageReplicasErr = rsc.manageReplicas(filteredPods, rs) } - copy, err := api.Scheme.DeepCopy(rs) + copy, err := scheme.Scheme.DeepCopy(rs) if err != nil { return err } diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index ba39caadb2f..8eec1bacc8b 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -167,6 +167,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/install:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD index fb411b57c28..84b29bd93f6 100644 --- a/pkg/kubelet/config/BUILD +++ b/pkg/kubelet/config/BUILD @@ -24,6 +24,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/helper:go_default_library", + "//pkg/api/install:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/api/validation:go_default_library", diff --git a/pkg/kubelet/config/common.go b/pkg/kubelet/config/common.go index 283e37470a5..8203efa57ce 100644 --- a/pkg/kubelet/config/common.go +++ b/pkg/kubelet/config/common.go @@ -29,6 +29,10 @@ import ( utilyaml "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/helper" + // TODO: remove this import if + // api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() is changed + // to "v1"? + _ "k8s.io/kubernetes/pkg/api/install" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index e4facc8249e..728a0e5efb0 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -61,6 +61,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/install:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index 0d2be5c0fd7..b25e740ded2 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -22,6 +22,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api" + _ "k8s.io/kubernetes/pkg/api/install" ) func TestFieldPath(t *testing.T) { diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index 1361ac50b2e..d1aafa86054 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -35,6 +35,10 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" + // TODO: remove this import if + // api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() is changed + // to "v1"? + _ "k8s.io/kubernetes/pkg/api/install" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/server/portforward" diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 2f63ba30877..95a76a2f80e 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -62,6 +62,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/install:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 045a6144b38..04ff198efc9 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -50,6 +50,8 @@ import ( "k8s.io/client-go/tools/remotecommand" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" + // Do some initialization to decode the query parameters correctly. + _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/pkg/volume/util/BUILD b/pkg/volume/util/BUILD index b63a85a8431..db6adb87e5b 100644 --- a/pkg/volume/util/BUILD +++ b/pkg/volume/util/BUILD @@ -46,6 +46,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api/install:go_default_library", "//pkg/api/v1/helper:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go index e1b8c902348..280895cee79 100644 --- a/pkg/volume/util/util_test.go +++ b/pkg/volume/util/util_test.go @@ -23,6 +23,9 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + // util.go uses api.Codecs.LegacyCodec so import this package to do some + // resource initialization. + _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/v1/helper" )