Migrate api.Scheme to scheme.Scheme

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
 				}

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",
     ],
 )
 

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