From a765b8cfca7a63fbc3846be77b13a7885958088f Mon Sep 17 00:00:00 2001 From: Jacob Simpson Date: Mon, 10 Jul 2017 10:54:48 -0700 Subject: [PATCH] Migrate api.Scheme to scheme.Scheme --- pkg/controller/BUILD | 1 + pkg/controller/cloud/BUILD | 2 +- pkg/controller/cloud/nodecontroller.go | 6 +++--- pkg/controller/controller_utils.go | 7 ++++--- pkg/controller/daemon/update.go | 8 ++++---- pkg/controller/daemon/util/BUILD | 2 +- pkg/controller/daemon/util/daemonset_util.go | 4 ++-- pkg/controller/deployment/BUILD | 1 + pkg/controller/deployment/sync.go | 8 ++++---- pkg/controller/deployment/util/BUILD | 4 ++-- .../deployment/util/deployment_util.go | 8 ++++---- .../deployment/util/deployment_util_test.go | 4 ++-- pkg/controller/deployment/util/pod_util.go | 4 ++-- .../deployment/util/replicaset_util.go | 6 +++--- pkg/controller/disruption/BUILD | 3 ++- pkg/controller/disruption/disruption.go | 8 ++++---- pkg/controller/disruption/disruption_test.go | 3 ++- pkg/controller/endpoint/BUILD | 1 + pkg/controller/endpoint/endpoints_controller.go | 3 ++- pkg/controller/node/BUILD | 1 + pkg/controller/node/controller_utils.go | 9 +++++---- pkg/controller/node/nodecontroller.go | 6 +++--- pkg/controller/podautoscaler/BUILD | 1 + pkg/controller/podautoscaler/horizontal.go | 7 ++++--- pkg/controller/replication/BUILD | 2 +- .../replication/replication_controller.go | 6 +++--- pkg/controller/service/BUILD | 4 ++-- pkg/controller/service/servicecontroller.go | 6 +++--- pkg/controller/service/servicecontroller_test.go | 4 ++-- pkg/controller/ttl/BUILD | 2 +- pkg/controller/ttl/ttlcontroller.go | 4 ++-- .../volume/attachdetach/statusupdater/BUILD | 2 +- .../statusupdater/node_status_updater.go | 4 ++-- pkg/controller/volume/attachdetach/util/BUILD | 2 +- pkg/controller/volume/attachdetach/util/util.go | 6 +++--- pkg/controller/volume/persistentvolume/BUILD | 3 ++- .../volume/persistentvolume/framework_test.go | 12 ++++++------ .../volume/persistentvolume/pv_controller.go | 16 ++++++++-------- .../persistentvolume/pv_controller_base.go | 10 +++++----- pkg/kubelet/BUILD | 1 + pkg/kubelet/config/BUILD | 1 + pkg/kubelet/config/config_test.go | 8 ++++---- pkg/kubelet/kubelet_resources.go | 6 +++--- pkg/kubelet/status/BUILD | 2 +- pkg/kubelet/status/status_manager.go | 4 ++-- pkg/kubelet/volumemanager/populator/BUILD | 2 +- .../desired_state_of_world_populator.go | 4 ++-- test/e2e_federation/BUILD | 2 +- test/e2e_federation/service.go | 4 ++-- test/e2e_node/BUILD | 2 ++ test/e2e_node/gpus.go | 4 ++-- test/e2e_node/node_container_manager_test.go | 4 ++-- test/e2e_node/util.go | 5 +++-- 53 files changed, 128 insertions(+), 111 deletions(-) diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index d7455abf14a..1ecf04e8d27 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -51,6 +51,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount: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/authentication/v1:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", diff --git a/pkg/controller/cloud/BUILD b/pkg/controller/cloud/BUILD index ed0741f91c4..b7d420c44b6 100644 --- a/pkg/controller/cloud/BUILD +++ b/pkg/controller/cloud/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["nodecontroller.go"], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1/node:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/cloudprovider:go_default_library", @@ -28,6 +27,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/informers/core/v1: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/tools/cache:go_default_library", "//vendor/k8s.io/client-go/tools/record:go_default_library", diff --git a/pkg/controller/cloud/nodecontroller.go b/pkg/controller/cloud/nodecontroller.go index 1eb247de4b1..71b07aa5e46 100644 --- a/pkg/controller/cloud/nodecontroller.go +++ b/pkg/controller/cloud/nodecontroller.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" coreinformers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/pkg/api" nodeutilv1 "k8s.io/kubernetes/pkg/api/v1/node" clientretry "k8s.io/kubernetes/pkg/client/retry" "k8s.io/kubernetes/pkg/cloudprovider" @@ -80,7 +80,7 @@ func NewCloudNodeController( nodeStatusUpdateFrequency time.Duration) *CloudNodeController { eventBroadcaster := record.NewBroadcaster() - recorder := eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "cloudcontrollermanager"}) + recorder := eventBroadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "cloudcontrollermanager"}) eventBroadcaster.StartLogging(glog.Infof) if kubeClient != nil { glog.V(0).Infof("Sending events to api server.") @@ -179,7 +179,7 @@ func (cnc *CloudNodeController) updateNodeAddress(node *v1.Node, instances cloud } nodeAddresses = []v1.NodeAddress{*nodeIP} } - nodeCopy, err := api.Scheme.DeepCopy(node) + nodeCopy, err := scheme.Scheme.DeepCopy(node) if err != nil { glog.Errorf("failed to copy node to a new object") return diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index fb532111d85..abb62b8096c 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -39,6 +39,7 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/integer" @@ -465,7 +466,7 @@ func getPodsAnnotationSet(template *v1.PodTemplateSpec, object runtime.Object) ( for k, v := range template.Annotations { desiredAnnotations[k] = v } - createdByRef, err := ref.GetReference(api.Scheme, object) + createdByRef, err := ref.GetReference(scheme.Scheme, object) if err != nil { return desiredAnnotations, fmt.Errorf("unable to get controller reference: %v", err) } @@ -560,7 +561,7 @@ func GetPodFromTemplate(template *v1.PodTemplateSpec, parentObject runtime.Objec if controllerRef != nil { pod.OwnerReferences = append(pod.OwnerReferences, *controllerRef) } - clone, err := api.Scheme.DeepCopy(&template.Spec) + clone, err := scheme.Scheme.DeepCopy(&template.Spec) if err != nil { return nil, err } @@ -965,7 +966,7 @@ func PatchNodeTaints(c clientset.Interface, nodeName string, oldNode *v1.Node, n } newTaints := newNode.Spec.Taints - objCopy, err := api.Scheme.DeepCopy(oldNode) + objCopy, err := scheme.Scheme.DeepCopy(oldNode) if err != nil { return fmt.Errorf("failed to copy node object %#v: %v", oldNode, err) } diff --git a/pkg/controller/daemon/update.go b/pkg/controller/daemon/update.go index 4a3235faf9e..6c765d0da69 100644 --- a/pkg/controller/daemon/update.go +++ b/pkg/controller/daemon/update.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" intstrutil "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/json" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/daemon/util" @@ -94,7 +94,7 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur // We use history name instead of computing hash, so that we don't need to worry about hash collision if _, ok := history.Labels[extensions.DefaultDaemonSetUniqueLabelKey]; !ok { var clone interface{} - clone, err = api.Scheme.DeepCopy(history) + clone, err = scheme.Scheme.DeepCopy(history) if err != nil { return nil, nil, err } @@ -134,7 +134,7 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur // Update revision number if necessary if cur.Revision < currRevision { var clone interface{} - clone, err = api.Scheme.DeepCopy(cur) + clone, err = scheme.Scheme.DeepCopy(cur) if err != nil { return nil, nil, err } @@ -233,7 +233,7 @@ func (dsc *DaemonSetsController) dedupCurHistories(ds *extensions.DaemonSet, cur } for _, pod := range pods { if pod.Labels[extensions.DefaultDaemonSetUniqueLabelKey] != keepCur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] { - clone, err := api.Scheme.DeepCopy(pod) + clone, err := scheme.Scheme.DeepCopy(pod) if err != nil { return nil, err } diff --git a/pkg/controller/daemon/util/BUILD b/pkg/controller/daemon/util/BUILD index dd26cfa24e1..a14a6b39c07 100644 --- a/pkg/controller/daemon/util/BUILD +++ b/pkg/controller/daemon/util/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["daemonset_util.go"], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1/helper:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/util/labels:go_default_library", @@ -21,6 +20,7 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", ], ) diff --git a/pkg/controller/daemon/util/daemonset_util.go b/pkg/controller/daemon/util/daemonset_util.go index d17ea916523..8c0bc1aaa32 100644 --- a/pkg/controller/daemon/util/daemonset_util.go +++ b/pkg/controller/daemon/util/daemonset_util.go @@ -22,7 +22,7 @@ import ( "k8s.io/api/core/v1" extensions "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" podutil "k8s.io/kubernetes/pkg/api/v1/pod" labelsutil "k8s.io/kubernetes/pkg/util/labels" @@ -33,7 +33,7 @@ import ( // label which contains templateGeneration (for backward compatibility), // hash of provided template and sets default daemon tolerations. func CreatePodTemplate(template v1.PodTemplateSpec, generation int64, hash string) v1.PodTemplateSpec { - obj, _ := api.Scheme.DeepCopy(template) + obj, _ := scheme.Scheme.DeepCopy(template) newTemplate := obj.(v1.PodTemplateSpec) // DaemonSet pods shouldn't be deleted by NodeController in case of node problems. // Add infinite toleration for taint notReady:NoExecute here diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 302d43ac337..1e42669bf19 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -38,6 +38,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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/listers/extensions/v1beta1:go_default_library", diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 88b7395a0f5..cb0e993ec62 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" labelsutil "k8s.io/kubernetes/pkg/util/labels" @@ -250,7 +250,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *extensions.Deployment, rsLis // and maxReplicas) and also update the revision annotation in the deployment with the // latest revision. if existingNewRS != nil { - objCopy, err := api.Scheme.Copy(existingNewRS) + objCopy, err := scheme.Scheme.Copy(existingNewRS) if err != nil { return nil, err } @@ -290,7 +290,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *extensions.Deployment, rsLis } // new ReplicaSet does not exist, create one. - templateCopy, err := api.Scheme.DeepCopy(d.Spec.Template) + templateCopy, err := scheme.Scheme.DeepCopy(d.Spec.Template) if err != nil { return nil, err } @@ -513,7 +513,7 @@ func (dc *DeploymentController) scaleReplicaSetAndRecordEvent(rs *extensions.Rep } func (dc *DeploymentController) scaleReplicaSet(rs *extensions.ReplicaSet, newScale int32, deployment *extensions.Deployment, scalingOperation string) (bool, *extensions.ReplicaSet, error) { - objCopy, err := api.Scheme.Copy(rs) + objCopy, err := scheme.Scheme.Copy(rs) if err != nil { return false, nil, err } diff --git a/pkg/controller/deployment/util/BUILD b/pkg/controller/deployment/util/BUILD index 2010bd7a068..e50adc15cf7 100644 --- a/pkg/controller/deployment/util/BUILD +++ b/pkg/controller/deployment/util/BUILD @@ -17,7 +17,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/controller:go_default_library", @@ -34,6 +33,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait: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", @@ -51,7 +51,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/hash:go_default_library", @@ -63,6 +62,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", ], ) diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index ffeccf849f6..b4c8fb48a25 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -36,10 +36,10 @@ import ( intstrutil "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" corelisters "k8s.io/client-go/listers/core/v1" extensionslisters "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/util/integer" - "k8s.io/kubernetes/pkg/api" internalextensions "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/controller" labelsutil "k8s.io/kubernetes/pkg/util/labels" @@ -635,12 +635,12 @@ func ListPods(deployment *extensions.Deployment, rsList []*extensions.ReplicaSet // (e.g. the addition of a new field will cause the hash code to change) // Note that we assume input podTemplateSpecs contain non-empty labels func EqualIgnoreHash(template1, template2 *v1.PodTemplateSpec) (bool, error) { - cp, err := api.Scheme.DeepCopy(template1) + cp, err := scheme.Scheme.DeepCopy(template1) if err != nil { return false, err } t1Copy := cp.(*v1.PodTemplateSpec) - cp, err = api.Scheme.DeepCopy(template2) + cp, err = scheme.Scheme.DeepCopy(template2) if err != nil { return false, err } @@ -978,7 +978,7 @@ func ResolveFenceposts(maxSurge, maxUnavailable *intstrutil.IntOrString, desired } func DeploymentDeepCopy(deployment *extensions.Deployment) (*extensions.Deployment, error) { - objCopy, err := api.Scheme.DeepCopy(deployment) + objCopy, err := scheme.Scheme.DeepCopy(deployment) if err != nil { return nil, err } diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index e1f3993be4e..93ae76a8ffd 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes/fake" + "k8s.io/client-go/kubernetes/scheme" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/api" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/controller" ) @@ -185,7 +185,7 @@ func newDControllerRef(d *extensions.Deployment) *metav1.OwnerReference { // generateRS creates a replica set, with the input deployment's template as its template func generateRS(deployment extensions.Deployment) extensions.ReplicaSet { - cp, _ := api.Scheme.DeepCopy(deployment.Spec.Template) + cp, _ := scheme.Scheme.DeepCopy(deployment.Spec.Template) template := cp.(v1.PodTemplateSpec) return extensions.ReplicaSet{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/controller/deployment/util/pod_util.go b/pkg/controller/deployment/util/pod_util.go index 38991f48684..240f9b119a1 100644 --- a/pkg/controller/deployment/util/pod_util.go +++ b/pkg/controller/deployment/util/pod_util.go @@ -21,9 +21,9 @@ import ( "k8s.io/api/core/v1" errorsutil "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" corelisters "k8s.io/client-go/listers/core/v1" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/retry" ) @@ -42,7 +42,7 @@ func UpdatePodWithRetries(podClient v1core.PodInterface, podLister corelisters.P if err != nil { return err } - obj, deepCopyErr := api.Scheme.DeepCopy(pod) + obj, deepCopyErr := scheme.Scheme.DeepCopy(pod) if deepCopyErr != nil { return deepCopyErr } diff --git a/pkg/controller/deployment/util/replicaset_util.go b/pkg/controller/deployment/util/replicaset_util.go index ceabf25ec6a..dd1b5a96553 100644 --- a/pkg/controller/deployment/util/replicaset_util.go +++ b/pkg/controller/deployment/util/replicaset_util.go @@ -24,9 +24,9 @@ import ( "k8s.io/api/core/v1" extensions "k8s.io/api/extensions/v1beta1" errorsutil "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/client-go/kubernetes/scheme" unversionedextensions "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" extensionslisters "k8s.io/client-go/listers/extensions/v1beta1" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/retry" "k8s.io/kubernetes/pkg/controller" labelsutil "k8s.io/kubernetes/pkg/util/labels" @@ -47,7 +47,7 @@ func UpdateRSWithRetries(rsClient unversionedextensions.ReplicaSetInterface, rsL if err != nil { return err } - obj, deepCopyErr := api.Scheme.DeepCopy(rs) + obj, deepCopyErr := scheme.Scheme.DeepCopy(rs) if deepCopyErr != nil { return deepCopyErr } @@ -71,7 +71,7 @@ func UpdateRSWithRetries(rsClient unversionedextensions.ReplicaSetInterface, rsL // GetReplicaSetHash returns the pod template hash of a ReplicaSet's pod template space func GetReplicaSetHash(rs *extensions.ReplicaSet, uniquifier *int64) (string, error) { - template, err := api.Scheme.DeepCopy(rs.Spec.Template) + template, err := scheme.Scheme.DeepCopy(rs.Spec.Template) if err != nil { return "", err } diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index a75f176c100..efde431a2a8 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["disruption.go"], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/controller:go_default_library", "//vendor/github.com/golang/glog:go_default_library", @@ -32,6 +31,7 @@ go_library( "//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/informers/policy/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/policy/v1beta1:go_default_library", "//vendor/k8s.io/client-go/listers/apps/v1beta1:go_default_library", @@ -62,6 +62,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/client-go/informers:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", ], diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index dff8f8bbf0f..ade69e08d54 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -37,6 +37,7 @@ import ( extensionsinformers "k8s.io/client-go/informers/extensions/v1beta1" policyinformers "k8s.io/client-go/informers/policy/v1beta1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" policyclientset "k8s.io/client-go/kubernetes/typed/policy/v1beta1" appslisters "k8s.io/client-go/listers/apps/v1beta1" @@ -46,7 +47,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/pkg/api" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" @@ -125,7 +125,7 @@ func NewDisruptionController( recheckQueue: workqueue.NewNamedDelayingQueue("disruption-recheck"), broadcaster: record.NewBroadcaster(), } - dc.recorder = dc.broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "controllermanager"}) + dc.recorder = dc.broadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "controllermanager"}) dc.getUpdater = func() updater { return dc.writePdbStatus } @@ -689,7 +689,7 @@ func (dc *DisruptionController) buildDisruptedPodMap(pods []*v1.Pod, pdb *policy // this field correctly, we will prevent the /evict handler from approving an // eviction when it may be unsafe to do so. func (dc *DisruptionController) failSafe(pdb *policy.PodDisruptionBudget) error { - obj, err := api.Scheme.DeepCopy(pdb) + obj, err := scheme.Scheme.DeepCopy(pdb) if err != nil { return err } @@ -720,7 +720,7 @@ func (dc *DisruptionController) updatePdbStatus(pdb *policy.PodDisruptionBudget, return nil } - obj, err := api.Scheme.DeepCopy(pdb) + obj, err := scheme.Scheme.DeepCopy(pdb) if err != nil { return err } diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 51776d78a1d..4f56a3bca09 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/client-go/informers" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" @@ -49,7 +50,7 @@ func (ps *pdbStates) Set(pdb *policy.PodDisruptionBudget) error { if err != nil { return err } - obj, err := api.Scheme.DeepCopy(pdb) + obj, err := scheme.Scheme.DeepCopy(pdb) if err != nil { return err } diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index 25840ea4d98..80e14e0fa13 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -31,6 +31,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/informers/core/v1: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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library", diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index f3eb403d2d1..fcc0991d412 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" coreinformers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/leaderelection/resourcelock" @@ -442,7 +443,7 @@ func (e *EndpointController) syncService(key string) error { glog.V(5).Infof("endpoints are equal for %s/%s, skipping update", service.Namespace, service.Name) return nil } - copy, err := api.Scheme.DeepCopy(currentEndpoints) + copy, err := scheme.Scheme.DeepCopy(currentEndpoints) if err != nil { return err } diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index 3a0998be6dd..9da8d36e200 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -54,6 +54,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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/listers/extensions/v1beta1:go_default_library", diff --git a/pkg/controller/node/controller_utils.go b/pkg/controller/node/controller_utils.go index 3c4ea0660f0..be6ed93dc39 100644 --- a/pkg/controller/node/controller_utils.go +++ b/pkg/controller/node/controller_utils.go @@ -28,6 +28,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientv1 "k8s.io/api/core/v1" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" @@ -319,7 +320,7 @@ func swapNodeControllerTaint(kubeClient clientset.Interface, taintToAdd, taintTo func createAddNodeHandler(f func(node *v1.Node) error) func(obj interface{}) { return func(originalObj interface{}) { - obj, err := api.Scheme.DeepCopy(originalObj) + obj, err := scheme.Scheme.DeepCopy(originalObj) if err != nil { utilruntime.HandleError(err) return @@ -334,12 +335,12 @@ func createAddNodeHandler(f func(node *v1.Node) error) func(obj interface{}) { func createUpdateNodeHandler(f func(oldNode, newNode *v1.Node) error) func(oldObj, newObj interface{}) { return func(origOldObj, origNewObj interface{}) { - oldObj, err := api.Scheme.DeepCopy(origOldObj) + oldObj, err := scheme.Scheme.DeepCopy(origOldObj) if err != nil { utilruntime.HandleError(err) return } - newObj, err := api.Scheme.DeepCopy(origNewObj) + newObj, err := scheme.Scheme.DeepCopy(origNewObj) if err != nil { utilruntime.HandleError(err) return @@ -355,7 +356,7 @@ func createUpdateNodeHandler(f func(oldNode, newNode *v1.Node) error) func(oldOb func createDeleteNodeHandler(f func(node *v1.Node) error) func(obj interface{}) { return func(originalObj interface{}) { - obj, err := api.Scheme.DeepCopy(originalObj) + obj, err := scheme.Scheme.DeepCopy(originalObj) if err != nil { utilruntime.HandleError(err) return diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 742e3111644..50d5a4f6705 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientv1 "k8s.io/api/core/v1" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" @@ -44,7 +45,6 @@ import ( clientset "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" extensionslisters "k8s.io/client-go/listers/extensions/v1beta1" - "k8s.io/kubernetes/pkg/api" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" v1node "k8s.io/kubernetes/pkg/api/v1/node" "k8s.io/kubernetes/pkg/cloudprovider" @@ -218,7 +218,7 @@ func NewNodeController( runTaintManager bool, useTaintBasedEvictions bool) (*NodeController, error) { eventBroadcaster := record.NewBroadcaster() - recorder := eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "controllermanager"}) + recorder := eventBroadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "controllermanager"}) eventBroadcaster.StartLogging(glog.Infof) if kubeClient != nil { glog.V(0).Infof("Sending events to api server.") @@ -569,7 +569,7 @@ func (nc *NodeController) monitorNodeStatus() error { var gracePeriod time.Duration var observedReadyCondition v1.NodeCondition var currentReadyCondition *v1.NodeCondition - nodeCopy, err := api.Scheme.DeepCopy(nodes[i]) + nodeCopy, err := scheme.Scheme.DeepCopy(nodes[i]) if err != nil { utilruntime.HandleError(err) continue diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index 92106a5f47e..dbf9e2f12f5 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -38,6 +38,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/informers/autoscaling/v1:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1: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", diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 5e3f813832b..68d72508f99 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -37,6 +37,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" autoscalinginformers "k8s.io/client-go/informers/autoscaling/v1" + "k8s.io/client-go/kubernetes/scheme" autoscalingclient "k8s.io/client-go/kubernetes/typed/autoscaling/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1" extensionsclient "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" @@ -112,7 +113,7 @@ func NewHorizontalController( broadcaster := record.NewBroadcaster() // TODO: remove the wrapper when every clients have moved to use the clientset. broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: evtNamespacer.Events("")}) - recorder := broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "horizontal-pod-autoscaler"}) + recorder := broadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "horizontal-pod-autoscaler"}) hpaController := &HorizontalController{ replicaCalc: replicaCalc, @@ -358,7 +359,7 @@ func (a *HorizontalController) reconcileKey(key string) error { func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.HorizontalPodAutoscaler) error { // make a copy so that we never mutate the shared informer cache (conversion can mutate the object) - hpav1Raw, err := api.Scheme.DeepCopy(hpav1Shared) + hpav1Raw, err := scheme.Scheme.DeepCopy(hpav1Shared) if err != nil { a.eventRecorder.Event(hpav1Shared, v1.EventTypeWarning, "FailedConvertHPA", err.Error()) return fmt.Errorf("failed to deep-copy the HPA: %v", err) @@ -372,7 +373,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho return fmt.Errorf("failed to convert the given HPA to %s: %v", autoscalingv2.SchemeGroupVersion.String(), err) } hpa := hpaRaw.(*autoscalingv2.HorizontalPodAutoscaler) - hpaStatusOriginalRaw, err := api.Scheme.DeepCopy(&hpa.Status) + hpaStatusOriginalRaw, err := scheme.Scheme.DeepCopy(&hpa.Status) if err != nil { a.eventRecorder.Event(hpav1Shared, v1.EventTypeWarning, "FailedConvertHPA", err.Error()) return fmt.Errorf("failed to deep-copy the HPA status: %v", err) diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index bd535362c04..93bb8d7879b 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -17,7 +17,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/metrics:go_default_library", @@ -31,6 +30,7 @@ go_library( "//vendor/k8s.io/apiserver/pkg/util/trace:go_default_library", "//vendor/k8s.io/client-go/informers/core/v1: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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 7e82e007bd4..8f7bf4cfca2 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -36,12 +36,12 @@ import ( utiltrace "k8s.io/apiserver/pkg/util/trace" coreinformers "k8s.io/client-go/informers/core/v1" 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" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/pkg/api" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" @@ -102,7 +102,7 @@ func NewReplicationManager(podInformer coreinformers.PodInformer, rcInformer cor kubeClient: kubeClient, podControl: controller.RealPodControl{ KubeClient: kubeClient, - Recorder: eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "replication-controller"}), + Recorder: eventBroadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "replication-controller"}), }, burstReplicas: burstReplicas, expectations: controller.NewUIDTrackingControllerExpectations(controller.NewControllerExpectations()), @@ -612,7 +612,7 @@ func (rm *ReplicationManager) syncReplicationController(key string) error { } trace.Step("manageReplicas done") - copy, err := api.Scheme.DeepCopy(rc) + copy, err := scheme.Scheme.DeepCopy(rc) if err != nil { return err } diff --git a/pkg/controller/service/BUILD b/pkg/controller/service/BUILD index 5f1e19a1f1d..c9b48c6b95f 100644 --- a/pkg/controller/service/BUILD +++ b/pkg/controller/service/BUILD @@ -17,7 +17,6 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/kubeadm/app/constants:go_default_library", - "//pkg/api:go_default_library", "//pkg/api/v1/helper:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller:go_default_library", @@ -29,6 +28,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/informers/core/v1: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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", @@ -43,7 +43,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/controller:go_default_library", @@ -52,6 +51,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/client-go/informers:go_default_library", "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/tools/record:go_default_library", ], ) diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index aa3b96ef61f..3af38ac82e5 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -32,13 +32,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" coreinformers "k8s.io/client-go/informers/core/v1" 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" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/pkg/api" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" @@ -107,7 +107,7 @@ func New( ) (*ServiceController, error) { broadcaster := record.NewBroadcaster() broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.Core().RESTClient()).Events("")}) - recorder := broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "service-controller"}) + recorder := broadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "service-controller"}) if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { metrics.RegisterMetricAndTrackRateLimiterUsage("service_controller", kubeClient.Core().RESTClient().GetRateLimiter()) @@ -299,7 +299,7 @@ func (s *ServiceController) createLoadBalancerIfNeeded(key string, service *v1.S // TODO: Be careful here ... what if there were other changes to the service? if !v1helper.LoadBalancerStatusEqual(previousState, newState) { // Make a copy so we don't mutate the shared informer cache - copy, err := api.Scheme.DeepCopy(service) + copy, err := scheme.Scheme.DeepCopy(service) if err != nil { return err, retryable } diff --git a/pkg/controller/service/servicecontroller_test.go b/pkg/controller/service/servicecontroller_test.go index a117b380686..06d35754744 100644 --- a/pkg/controller/service/servicecontroller_test.go +++ b/pkg/controller/service/servicecontroller_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller" @@ -367,7 +367,7 @@ func TestProcessServiceUpdate(t *testing.T) { t.Fatalf("get service key error, expected: %s, got: %s", keyExpected, keyGot.(string)) } - copy, err := api.Scheme.DeepCopy(svc) + copy, err := scheme.Scheme.DeepCopy(svc) if err != nil { t.Fatalf("copy service error: %v", err) } diff --git a/pkg/controller/ttl/BUILD b/pkg/controller/ttl/BUILD index 4f94f540454..5654c4c5542 100644 --- a/pkg/controller/ttl/BUILD +++ b/pkg/controller/ttl/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["ttlcontroller.go"], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/controller:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -25,6 +24,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/informers/core/v1: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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", diff --git a/pkg/controller/ttl/ttlcontroller.go b/pkg/controller/ttl/ttlcontroller.go index 85f24a2da80..91e2a3cdea2 100644 --- a/pkg/controller/ttl/ttlcontroller.go +++ b/pkg/controller/ttl/ttlcontroller.go @@ -42,10 +42,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" informers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/controller" "github.com/golang/glog" @@ -288,7 +288,7 @@ func (ttlc *TTLController) updateNodeIfNeeded(key string) error { return nil } - objCopy, err := api.Scheme.DeepCopy(node) + objCopy, err := scheme.Scheme.DeepCopy(node) if err != nil { return err } diff --git a/pkg/controller/volume/attachdetach/statusupdater/BUILD b/pkg/controller/volume/attachdetach/statusupdater/BUILD index d24d153ae5f..2a7119b5da0 100644 --- a/pkg/controller/volume/attachdetach/statusupdater/BUILD +++ b/pkg/controller/volume/attachdetach/statusupdater/BUILD @@ -15,7 +15,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/controller/volume/attachdetach/cache:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -23,6 +22,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch: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/listers/core/v1:go_default_library", ], ) diff --git a/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go b/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go index b6ba9e6b913..acfc2b97bbc 100644 --- a/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go +++ b/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/strategicpatch" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" corelisters "k8s.io/client-go/listers/core/v1" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" ) @@ -102,7 +102,7 @@ func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error { } func (nsu *nodeStatusUpdater) updateNodeStatus(nodeName types.NodeName, nodeObj *v1.Node, attachedVolumes []v1.AttachedVolume) error { - clonedNode, err := api.Scheme.DeepCopy(nodeObj) + clonedNode, err := scheme.Scheme.DeepCopy(nodeObj) if err != nil { return fmt.Errorf("error cloning node %q: %v", nodeName, diff --git a/pkg/controller/volume/attachdetach/util/BUILD b/pkg/controller/volume/attachdetach/util/BUILD index 603e0ec082a..ac6db4a6b31 100644 --- a/pkg/controller/volume/attachdetach/util/BUILD +++ b/pkg/controller/volume/attachdetach/util/BUILD @@ -12,13 +12,13 @@ go_library( srcs = ["util.go"], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/controller/volume/attachdetach/cache:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util/volumehelper:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/listers/core/v1:go_default_library", ], ) diff --git a/pkg/controller/volume/attachdetach/util/util.go b/pkg/controller/volume/attachdetach/util/util.go index 11347e60ea3..68fb140cd4a 100644 --- a/pkg/controller/volume/attachdetach/util/util.go +++ b/pkg/controller/volume/attachdetach/util/util.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" corelisters "k8s.io/client-go/listers/core/v1" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util/volumehelper" @@ -80,7 +80,7 @@ func CreateVolumeSpec(podVolume v1.Volume, podNamespace string, pvcLister coreli // Do not return the original volume object, since it's from the shared // informer it may be mutated by another consumer. - clonedPodVolumeObj, err := api.Scheme.DeepCopy(&podVolume) + clonedPodVolumeObj, err := scheme.Scheme.DeepCopy(&podVolume) if err != nil || clonedPodVolumeObj == nil { return nil, fmt.Errorf( "failed to deep copy %q volume object. err=%v", podVolume.Name, err) @@ -146,7 +146,7 @@ func getPVSpecFromCache(name string, pvcReadOnly bool, expectedClaimUID types.UI // Do not return the object from the informer, since the store is shared it // may be mutated by another consumer. - clonedPVObj, err := api.Scheme.DeepCopy(pv) + clonedPVObj, err := scheme.Scheme.DeepCopy(pv) if err != nil || clonedPVObj == nil { return nil, fmt.Errorf("failed to deep copy %q PV object. err=%v", name, err) } diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index 4a5415753dc..a714e0d3c38 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -18,7 +18,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1/helper:go_default_library", "//pkg/api/v1/ref:go_default_library", "//pkg/cloudprovider:go_default_library", @@ -42,6 +41,7 @@ go_library( "//vendor/k8s.io/client-go/informers/core/v1:go_default_library", "//vendor/k8s.io/client-go/informers/storage/v1: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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/listers/storage/v1:go_default_library", @@ -83,6 +83,7 @@ go_test( "//vendor/k8s.io/client-go/informers:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/listers/storage/v1:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index 03334343710..64c75adb532 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -41,11 +41,11 @@ import ( "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" + "k8s.io/client-go/kubernetes/scheme" storagelisters "k8s.io/client-go/listers/storage/v1" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/controller" vol "k8s.io/kubernetes/pkg/volume" @@ -308,7 +308,7 @@ func (r *volumeReactor) checkVolumes(expectedVolumes []*v1.PersistentVolume) err for _, v := range r.volumes { // We must clone the volume because of golang race check - it was // written by the controller without any locks on it. - clone, _ := api.Scheme.DeepCopy(v) + clone, _ := scheme.Scheme.DeepCopy(v) v = clone.(*v1.PersistentVolume) v.ResourceVersion = "" if v.Spec.ClaimRef != nil { @@ -339,7 +339,7 @@ func (r *volumeReactor) checkClaims(expectedClaims []*v1.PersistentVolumeClaim) for _, c := range r.claims { // We must clone the claim because of golang race check - it was // written by the controller without any locks on it. - clone, _ := api.Scheme.DeepCopy(c) + clone, _ := scheme.Scheme.DeepCopy(c) c = clone.(*v1.PersistentVolumeClaim) c.ResourceVersion = "" gotMap[c.Name] = c @@ -508,7 +508,7 @@ func (r *volumeReactor) deleteVolumeEvent(volume *v1.PersistentVolume) { // Generate deletion event. Cloned volume is needed to prevent races (and we // would get a clone from etcd too). if r.fakeVolumeWatch != nil { - clone, _ := api.Scheme.DeepCopy(volume) + clone, _ := scheme.Scheme.DeepCopy(volume) volumeClone := clone.(*v1.PersistentVolume) r.fakeVolumeWatch.Delete(volumeClone) } @@ -526,7 +526,7 @@ func (r *volumeReactor) deleteClaimEvent(claim *v1.PersistentVolumeClaim) { // Generate deletion event. Cloned volume is needed to prevent races (and we // would get a clone from etcd too). if r.fakeClaimWatch != nil { - clone, _ := api.Scheme.DeepCopy(claim) + clone, _ := scheme.Scheme.DeepCopy(claim) claimClone := clone.(*v1.PersistentVolumeClaim) r.fakeClaimWatch.Delete(claimClone) } @@ -556,7 +556,7 @@ func (r *volumeReactor) modifyVolumeEvent(volume *v1.PersistentVolume) { // Generate deletion event. Cloned volume is needed to prevent races (and we // would get a clone from etcd too). if r.fakeVolumeWatch != nil { - clone, _ := api.Scheme.DeepCopy(volume) + clone, _ := scheme.Scheme.DeepCopy(volume) volumeClone := clone.(*v1.PersistentVolume) r.fakeVolumeWatch.Modify(volumeClone) } diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index d7c5fb6ec04..55d6dacc3aa 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -26,12 +26,12 @@ import ( storage "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" corelisters "k8s.io/client-go/listers/core/v1" storagelisters "k8s.io/client-go/listers/storage/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/pkg/api" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" "k8s.io/kubernetes/pkg/api/v1/ref" "k8s.io/kubernetes/pkg/cloudprovider" @@ -593,7 +593,7 @@ func (ctrl *PersistentVolumeController) updateClaimStatus(claim *v1.PersistentVo dirty := false - clone, err := api.Scheme.DeepCopy(claim) + clone, err := scheme.Scheme.DeepCopy(claim) if err != nil { return nil, fmt.Errorf("Error cloning claim: %v", err) } @@ -693,7 +693,7 @@ func (ctrl *PersistentVolumeController) updateVolumePhase(volume *v1.PersistentV return volume, nil } - clone, err := api.Scheme.DeepCopy(volume) + clone, err := scheme.Scheme.DeepCopy(volume) if err != nil { return nil, fmt.Errorf("Error cloning claim: %v", err) } @@ -758,7 +758,7 @@ func (ctrl *PersistentVolumeController) bindVolumeToClaim(volume *v1.PersistentV // The volume from method args can be pointing to watcher cache. We must not // modify these, therefore create a copy. - clone, err := api.Scheme.DeepCopy(volume) + clone, err := scheme.Scheme.DeepCopy(volume) if err != nil { return nil, fmt.Errorf("Error cloning pv: %v", err) } @@ -773,7 +773,7 @@ func (ctrl *PersistentVolumeController) bindVolumeToClaim(volume *v1.PersistentV volume.Spec.ClaimRef.Namespace != claim.Namespace || volume.Spec.ClaimRef.UID != claim.UID { - claimRef, err := ref.GetReference(api.Scheme, claim) + claimRef, err := ref.GetReference(scheme.Scheme, claim) if err != nil { return nil, fmt.Errorf("Unexpected error getting claim reference: %v", err) } @@ -823,7 +823,7 @@ func (ctrl *PersistentVolumeController) bindClaimToVolume(claim *v1.PersistentVo // The claim from method args can be pointing to watcher cache. We must not // modify these, therefore create a copy. - clone, err := api.Scheme.DeepCopy(claim) + clone, err := scheme.Scheme.DeepCopy(claim) if err != nil { return nil, fmt.Errorf("Error cloning claim: %v", err) } @@ -922,7 +922,7 @@ func (ctrl *PersistentVolumeController) unbindVolume(volume *v1.PersistentVolume glog.V(4).Infof("updating PersistentVolume[%s]: rolling back binding from %q", volume.Name, claimrefToClaimKey(volume.Spec.ClaimRef)) // Save the PV only when any modification is necessary. - clone, err := api.Scheme.DeepCopy(volume) + clone, err := scheme.Scheme.DeepCopy(volume) if err != nil { return fmt.Errorf("Error cloning pv: %v", err) } @@ -1295,7 +1295,7 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(claimObj interfa // Prepare a claimRef to the claim early (to fail before a volume is // provisioned) - claimRef, err := ref.GetReference(api.Scheme, claim) + claimRef, err := ref.GetReference(scheme.Scheme, claim) if err != nil { glog.V(3).Infof("unexpected error getting claim reference: %v", err) return diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index d7461c7d5b3..459434f861d 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -33,12 +33,12 @@ import ( coreinformers "k8s.io/client-go/informers/core/v1" storageinformers "k8s.io/client-go/informers/storage/v1" 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" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/goroutinemap" @@ -72,7 +72,7 @@ func NewController(p ControllerParameters) (*PersistentVolumeController, error) if eventRecorder == nil { broadcaster := record.NewBroadcaster() broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(p.KubeClient.Core().RESTClient()).Events("")}) - eventRecorder = broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "persistentvolume-controller"}) + eventRecorder = broadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "persistentvolume-controller"}) } controller := &PersistentVolumeController{ @@ -131,7 +131,7 @@ func (ctrl *PersistentVolumeController) initializeCaches(volumeLister corelister return } for _, volume := range volumeList { - clone, err := api.Scheme.DeepCopy(volume) + clone, err := scheme.Scheme.DeepCopy(volume) if err != nil { glog.Errorf("error cloning volume %q: %v", volume.Name, err) continue @@ -148,7 +148,7 @@ func (ctrl *PersistentVolumeController) initializeCaches(volumeLister corelister return } for _, claim := range claimList { - clone, err := api.Scheme.DeepCopy(claim) + clone, err := scheme.Scheme.DeepCopy(claim) if err != nil { glog.Errorf("error cloning claim %q: %v", claimToClaimKey(claim), err) continue @@ -408,7 +408,7 @@ func (ctrl *PersistentVolumeController) setClaimProvisioner(claim *v1.Persistent // The volume from method args can be pointing to watcher cache. We must not // modify these, therefore create a copy. - clone, err := api.Scheme.DeepCopy(claim) + clone, err := scheme.Scheme.DeepCopy(claim) if err != nil { return nil, fmt.Errorf("Error cloning pv: %v", err) } diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 8eec1bacc8b..3466f18325f 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -133,6 +133,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature: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/listers/core/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD index 84b29bd93f6..7ea9a36b8e3 100644 --- a/pkg/kubelet/config/BUILD +++ b/pkg/kubelet/config/BUILD @@ -76,6 +76,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/tools/record:go_default_library", "//vendor/k8s.io/client-go/util/testing:go_default_library", diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index 3bc05be51db..bef3e190ebb 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -29,8 +29,8 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/pkg/api" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/securitycontext" ) @@ -88,7 +88,7 @@ func CreatePodUpdate(op kubetypes.PodOperation, source string, pods ...*v1.Pod) func createPodConfigTester(mode PodConfigNotificationMode) (chan<- interface{}, <-chan kubetypes.PodUpdate, *PodConfig) { eventBroadcaster := record.NewBroadcaster() - config := NewPodConfig(mode, eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "kubelet"})) + config := NewPodConfig(mode, eventBroadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "kubelet"})) channel := config.Channel(TestSource) ch := config.Updates() return channel, ch, config @@ -371,7 +371,7 @@ func TestPodUpdateAnnotations(t *testing.T) { pod.Annotations = make(map[string]string, 0) pod.Annotations["kubernetes.io/blah"] = "blah" - clone, err := api.Scheme.DeepCopy(pod) + clone, err := scheme.Scheme.DeepCopy(pod) if err != nil { t.Fatalf("%v", err) } @@ -403,7 +403,7 @@ func TestPodUpdateLabels(t *testing.T) { pod.Labels = make(map[string]string, 0) pod.Labels["key"] = "value" - clone, err := api.Scheme.DeepCopy(pod) + clone, err := scheme.Scheme.DeepCopy(pod) if err != nil { t.Fatalf("%v", err) } diff --git a/pkg/kubelet/kubelet_resources.go b/pkg/kubelet/kubelet_resources.go index db80a779495..00de6b4471b 100644 --- a/pkg/kubelet/kubelet_resources.go +++ b/pkg/kubelet/kubelet_resources.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/api/v1/resource" ) @@ -44,7 +44,7 @@ func (kl *Kubelet) defaultPodLimitsForDownwardApi(pod *v1.Pod, container *v1.Con } allocatable := node.Status.Allocatable glog.Errorf("allocatable: %v", allocatable) - podCopy, err := api.Scheme.Copy(pod) + podCopy, err := scheme.Scheme.Copy(pod) if err != nil { return nil, nil, fmt.Errorf("failed to perform a deep copy of pod object: %v", err) } @@ -58,7 +58,7 @@ func (kl *Kubelet) defaultPodLimitsForDownwardApi(pod *v1.Pod, container *v1.Con var outputContainer *v1.Container if container != nil { - containerCopy, err := api.Scheme.DeepCopy(container) + containerCopy, err := scheme.Scheme.DeepCopy(container) if err != nil { return nil, nil, fmt.Errorf("failed to perform a deep copy of container object: %v", err) } diff --git a/pkg/kubelet/status/BUILD b/pkg/kubelet/status/BUILD index f3283cf72d4..a0b08cf58bc 100644 --- a/pkg/kubelet/status/BUILD +++ b/pkg/kubelet/status/BUILD @@ -16,7 +16,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/pod:go_default_library", @@ -31,6 +30,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", ], ) diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index fb54e197640..e2cc46a64e6 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -22,6 +22,7 @@ import ( "time" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" "github.com/golang/glog" "k8s.io/api/core/v1" @@ -31,7 +32,6 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/api" podutil "k8s.io/kubernetes/pkg/api/v1/pod" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" @@ -590,7 +590,7 @@ func normalizeStatus(pod *v1.Pod, status *v1.PodStatus) *v1.PodStatus { } func copyStatus(source *v1.PodStatus) (v1.PodStatus, error) { - clone, err := api.Scheme.DeepCopy(source) + clone, err := scheme.Scheme.DeepCopy(source) if err != nil { glog.Errorf("Failed to clone status %+v: %v", source, err) return v1.PodStatus{}, err diff --git a/pkg/kubelet/volumemanager/populator/BUILD b/pkg/kubelet/volumemanager/populator/BUILD index 543a873cf0b..2815b77a0c2 100644 --- a/pkg/kubelet/volumemanager/populator/BUILD +++ b/pkg/kubelet/volumemanager/populator/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["desired_state_of_world_populator.go"], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/pod:go_default_library", @@ -29,6 +28,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", ], ) diff --git a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index a7c03894010..a584d535328 100644 --- a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/kubelet/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/pod" @@ -386,7 +386,7 @@ func (dswp *desiredStateOfWorldPopulator) createVolumeSpec( } // Do not return the original volume object, since the source could mutate it - clonedPodVolumeObj, err := api.Scheme.DeepCopy(&podVolume) + clonedPodVolumeObj, err := scheme.Scheme.DeepCopy(&podVolume) if err != nil || clonedPodVolumeObj == nil { return nil, "", fmt.Errorf( "failed to deep copy %q volume object. err=%v", podVolume.Name, err) diff --git a/test/e2e_federation/BUILD b/test/e2e_federation/BUILD index e47c5debb46..274a930df30 100644 --- a/test/e2e_federation/BUILD +++ b/test/e2e_federation/BUILD @@ -29,7 +29,6 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", "//federation/pkg/federatedtypes:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", - "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//test/e2e/chaosmonkey:go_default_library", @@ -49,6 +48,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait: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/tools/clientcmd:go_default_library", ], ) diff --git a/test/e2e_federation/service.go b/test/e2e_federation/service.go index 470175af488..9ea7731b75c 100644 --- a/test/e2e_federation/service.go +++ b/test/e2e_federation/service.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/kubernetes/scheme" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/test/e2e/framework" fedframework "k8s.io/kubernetes/test/e2e_federation/framework" @@ -184,7 +184,7 @@ var _ = framework.KubeDescribe("Federated Services [Feature:Federation]", func() backendPods = createBackendPodsOrFail(clusters, nsName, FederatedServicePodName) service = createLBServiceOrFail(f.FederationClientset, nsName, FederatedServiceName) - obj, err := api.Scheme.DeepCopy(service) + obj, err := scheme.Scheme.DeepCopy(service) // Cloning shouldn't fail. On the off-chance it does, we // should shallow copy service to serviceShard before // failing. If we don't do this we will never really diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 5a74dc968d9..849d571b19b 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -57,6 +57,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait: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", ], ) @@ -143,6 +144,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature: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/tools/cache:go_default_library", ], ) diff --git a/test/e2e_node/gpus.go b/test/e2e_node/gpus.go index a211b37f207..40b2d545b0d 100644 --- a/test/e2e_node/gpus.go +++ b/test/e2e_node/gpus.go @@ -24,7 +24,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/test/e2e/framework" @@ -94,7 +94,7 @@ var _ = framework.KubeDescribe("GPU [Serial]", func() { oldCfg, err = getCurrentKubeletConfig() framework.ExpectNoError(err) - clone, err := api.Scheme.DeepCopy(oldCfg) + clone, err := scheme.Scheme.DeepCopy(oldCfg) framework.ExpectNoError(err) newCfg := clone.(*componentconfig.KubeletConfiguration) if newCfg.FeatureGates != "" { diff --git a/test/e2e_node/node_container_manager_test.go b/test/e2e_node/node_container_manager_test.go index aa7bda5a1fe..17d80c853f0 100644 --- a/test/e2e_node/node_container_manager_test.go +++ b/test/e2e_node/node_container_manager_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/test/e2e/framework" @@ -161,7 +161,7 @@ func runTest(f *framework.Framework) error { if err := createTemporaryCgroupsForReservation(cgroupManager); err != nil { return err } - clone, err := api.Scheme.DeepCopy(oldCfg) + clone, err := scheme.Scheme.DeepCopy(oldCfg) if err != nil { return err } diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 6b91f59fc2d..92e6f2b689b 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -32,6 +32,7 @@ import ( k8serr "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/componentconfig" v1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" @@ -99,7 +100,7 @@ func tempSetCurrentKubeletConfig(f *framework.Framework, updateFunction func(ini if configEnabled { oldCfg, err = getCurrentKubeletConfig() framework.ExpectNoError(err) - clone, err := api.Scheme.DeepCopy(oldCfg) + clone, err := scheme.Scheme.DeepCopy(oldCfg) framework.ExpectNoError(err) newCfg := clone.(*componentconfig.KubeletConfiguration) updateFunction(newCfg) @@ -230,7 +231,7 @@ func decodeConfigz(resp *http.Response) (*componentconfig.KubeletConfiguration, return nil, err } - err = api.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) + err = scheme.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) if err != nil { return nil, err }