Skip to content

Commit a765b8c

Browse files
jcbsmpsnjcbsmpsn
committed
Migrate api.Scheme to scheme.Scheme
1 parent 2c70e5d commit a765b8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+128
-111
lines changed

‎pkg/controller/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ go_library(
5151
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
5252
"//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
5353
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
54+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
5455
"//vendor/k8s.io/client-go/kubernetes/typed/authentication/v1:go_default_library",
5556
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
5657
"//vendor/k8s.io/client-go/rest:go_default_library",

‎pkg/controller/cloud/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ go_library(
1313
srcs = ["nodecontroller.go"],
1414
tags = ["automanaged"],
1515
deps = [
16-
"//pkg/api:go_default_library",
1716
"//pkg/api/v1/node:go_default_library",
1817
"//pkg/client/retry:go_default_library",
1918
"//pkg/cloudprovider:go_default_library",
@@ -28,6 +27,7 @@ go_library(
2827
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
2928
"//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
3029
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
30+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
3131
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
3232
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
3333
"//vendor/k8s.io/client-go/tools/record:go_default_library",

‎pkg/controller/cloud/nodecontroller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import (
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
coreinformers "k8s.io/client-go/informers/core/v1"
3232
clientset "k8s.io/client-go/kubernetes"
33+
"k8s.io/client-go/kubernetes/scheme"
3334
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
3435
"k8s.io/client-go/tools/cache"
3536
"k8s.io/client-go/tools/record"
36-
"k8s.io/kubernetes/pkg/api"
3737
nodeutilv1 "k8s.io/kubernetes/pkg/api/v1/node"
3838
clientretry "k8s.io/kubernetes/pkg/client/retry"
3939
"k8s.io/kubernetes/pkg/cloudprovider"
@@ -80,7 +80,7 @@ func NewCloudNodeController(
8080
nodeStatusUpdateFrequency time.Duration) *CloudNodeController {
8181

8282
eventBroadcaster := record.NewBroadcaster()
83-
recorder := eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "cloudcontrollermanager"})
83+
recorder := eventBroadcaster.NewRecorder(scheme.Scheme, clientv1.EventSource{Component: "cloudcontrollermanager"})
8484
eventBroadcaster.StartLogging(glog.Infof)
8585
if kubeClient != nil {
8686
glog.V(0).Infof("Sending events to api server.")
@@ -179,7 +179,7 @@ func (cnc *CloudNodeController) updateNodeAddress(node *v1.Node, instances cloud
179179
}
180180
nodeAddresses = []v1.NodeAddress{*nodeIP}
181181
}
182-
nodeCopy, err := api.Scheme.DeepCopy(node)
182+
nodeCopy, err := scheme.Scheme.DeepCopy(node)
183183
if err != nil {
184184
glog.Errorf("failed to copy node to a new object")
185185
return

‎pkg/controller/controller_utils.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"k8s.io/apimachinery/pkg/util/strategicpatch"
4040
"k8s.io/apimachinery/pkg/util/wait"
4141
clientset "k8s.io/client-go/kubernetes"
42+
"k8s.io/client-go/kubernetes/scheme"
4243
"k8s.io/client-go/tools/cache"
4344
"k8s.io/client-go/tools/record"
4445
"k8s.io/client-go/util/integer"
@@ -465,7 +466,7 @@ func getPodsAnnotationSet(template *v1.PodTemplateSpec, object runtime.Object) (
465466
for k, v := range template.Annotations {
466467
desiredAnnotations[k] = v
467468
}
468-
createdByRef, err := ref.GetReference(api.Scheme, object)
469+
createdByRef, err := ref.GetReference(scheme.Scheme, object)
469470
if err != nil {
470471
return desiredAnnotations, fmt.Errorf("unable to get controller reference: %v", err)
471472
}
@@ -560,7 +561,7 @@ func GetPodFromTemplate(template *v1.PodTemplateSpec, parentObject runtime.Objec
560561
if controllerRef != nil {
561562
pod.OwnerReferences = append(pod.OwnerReferences, *controllerRef)
562563
}
563-
clone, err := api.Scheme.DeepCopy(&template.Spec)
564+
clone, err := scheme.Scheme.DeepCopy(&template.Spec)
564565
if err != nil {
565566
return nil, err
566567
}
@@ -965,7 +966,7 @@ func PatchNodeTaints(c clientset.Interface, nodeName string, oldNode *v1.Node, n
965966
}
966967

967968
newTaints := newNode.Spec.Taints
968-
objCopy, err := api.Scheme.DeepCopy(oldNode)
969+
objCopy, err := scheme.Scheme.DeepCopy(oldNode)
969970
if err != nil {
970971
return fmt.Errorf("failed to copy node object %#v: %v", oldNode, err)
971972
}

‎pkg/controller/daemon/update.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/runtime"
3333
intstrutil "k8s.io/apimachinery/pkg/util/intstr"
3434
"k8s.io/apimachinery/pkg/util/json"
35-
"k8s.io/kubernetes/pkg/api"
35+
"k8s.io/client-go/kubernetes/scheme"
3636
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
3737
"k8s.io/kubernetes/pkg/controller"
3838
"k8s.io/kubernetes/pkg/controller/daemon/util"
@@ -94,7 +94,7 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur
9494
// We use history name instead of computing hash, so that we don't need to worry about hash collision
9595
if _, ok := history.Labels[extensions.DefaultDaemonSetUniqueLabelKey]; !ok {
9696
var clone interface{}
97-
clone, err = api.Scheme.DeepCopy(history)
97+
clone, err = scheme.Scheme.DeepCopy(history)
9898
if err != nil {
9999
return nil, nil, err
100100
}
@@ -134,7 +134,7 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur
134134
// Update revision number if necessary
135135
if cur.Revision < currRevision {
136136
var clone interface{}
137-
clone, err = api.Scheme.DeepCopy(cur)
137+
clone, err = scheme.Scheme.DeepCopy(cur)
138138
if err != nil {
139139
return nil, nil, err
140140
}
@@ -233,7 +233,7 @@ func (dsc *DaemonSetsController) dedupCurHistories(ds *extensions.DaemonSet, cur
233233
}
234234
for _, pod := range pods {
235235
if pod.Labels[extensions.DefaultDaemonSetUniqueLabelKey] != keepCur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] {
236-
clone, err := api.Scheme.DeepCopy(pod)
236+
clone, err := scheme.Scheme.DeepCopy(pod)
237237
if err != nil {
238238
return nil, err
239239
}

‎pkg/controller/daemon/util/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ go_library(
1313
srcs = ["daemonset_util.go"],
1414
tags = ["automanaged"],
1515
deps = [
16-
"//pkg/api:go_default_library",
1716
"//pkg/api/v1/helper:go_default_library",
1817
"//pkg/api/v1/pod:go_default_library",
1918
"//pkg/util/labels:go_default_library",
2019
"//plugin/pkg/scheduler/algorithm:go_default_library",
2120
"//vendor/k8s.io/api/core/v1:go_default_library",
2221
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
2322
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
23+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
2424
],
2525
)
2626

‎pkg/controller/daemon/util/daemonset_util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"k8s.io/api/core/v1"
2323
extensions "k8s.io/api/extensions/v1beta1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25-
"k8s.io/kubernetes/pkg/api"
25+
"k8s.io/client-go/kubernetes/scheme"
2626
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
2727
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
2828
labelsutil "k8s.io/kubernetes/pkg/util/labels"
@@ -33,7 +33,7 @@ import (
3333
// label which contains templateGeneration (for backward compatibility),
3434
// hash of provided template and sets default daemon tolerations.
3535
func CreatePodTemplate(template v1.PodTemplateSpec, generation int64, hash string) v1.PodTemplateSpec {
36-
obj, _ := api.Scheme.DeepCopy(template)
36+
obj, _ := scheme.Scheme.DeepCopy(template)
3737
newTemplate := obj.(v1.PodTemplateSpec)
3838
// DaemonSet pods shouldn't be deleted by NodeController in case of node problems.
3939
// Add infinite toleration for taint notReady:NoExecute here

‎pkg/controller/deployment/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ go_library(
3838
"//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
3939
"//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library",
4040
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
41+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
4142
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
4243
"//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
4344
"//vendor/k8s.io/client-go/listers/extensions/v1beta1:go_default_library",

‎pkg/controller/deployment/sync.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/types"
3131
utilerrors "k8s.io/apimachinery/pkg/util/errors"
32-
"k8s.io/kubernetes/pkg/api"
32+
"k8s.io/client-go/kubernetes/scheme"
3333
"k8s.io/kubernetes/pkg/controller"
3434
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
3535
labelsutil "k8s.io/kubernetes/pkg/util/labels"
@@ -250,7 +250,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *extensions.Deployment, rsLis
250250
// and maxReplicas) and also update the revision annotation in the deployment with the
251251
// latest revision.
252252
if existingNewRS != nil {
253-
objCopy, err := api.Scheme.Copy(existingNewRS)
253+
objCopy, err := scheme.Scheme.Copy(existingNewRS)
254254
if err != nil {
255255
return nil, err
256256
}
@@ -290,7 +290,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *extensions.Deployment, rsLis
290290
}
291291

292292
// new ReplicaSet does not exist, create one.
293-
templateCopy, err := api.Scheme.DeepCopy(d.Spec.Template)
293+
templateCopy, err := scheme.Scheme.DeepCopy(d.Spec.Template)
294294
if err != nil {
295295
return nil, err
296296
}
@@ -513,7 +513,7 @@ func (dc *DeploymentController) scaleReplicaSetAndRecordEvent(rs *extensions.Rep
513513
}
514514

515515
func (dc *DeploymentController) scaleReplicaSet(rs *extensions.ReplicaSet, newScale int32, deployment *extensions.Deployment, scalingOperation string) (bool, *extensions.ReplicaSet, error) {
516-
objCopy, err := api.Scheme.Copy(rs)
516+
objCopy, err := scheme.Scheme.Copy(rs)
517517
if err != nil {
518518
return false, nil, err
519519
}

‎pkg/controller/deployment/util/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ go_library(
1717
],
1818
tags = ["automanaged"],
1919
deps = [
20-
"//pkg/api:go_default_library",
2120
"//pkg/apis/extensions:go_default_library",
2221
"//pkg/client/retry:go_default_library",
2322
"//pkg/controller:go_default_library",
@@ -34,6 +33,7 @@ go_library(
3433
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
3534
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
3635
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
36+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
3737
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
3838
"//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library",
3939
"//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
@@ -51,7 +51,6 @@ go_test(
5151
library = ":go_default_library",
5252
tags = ["automanaged"],
5353
deps = [
54-
"//pkg/api:go_default_library",
5554
"//pkg/api/v1:go_default_library",
5655
"//pkg/controller:go_default_library",
5756
"//pkg/util/hash:go_default_library",
@@ -63,6 +62,7 @@ go_test(
6362
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
6463
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
6564
"//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
65+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
6666
"//vendor/k8s.io/client-go/testing:go_default_library",
6767
],
6868
)

‎pkg/controller/deployment/util/deployment_util.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ import (
3636
intstrutil "k8s.io/apimachinery/pkg/util/intstr"
3737
"k8s.io/apimachinery/pkg/util/wait"
3838
clientset "k8s.io/client-go/kubernetes"
39+
"k8s.io/client-go/kubernetes/scheme"
3940
corelisters "k8s.io/client-go/listers/core/v1"
4041
extensionslisters "k8s.io/client-go/listers/extensions/v1beta1"
4142
"k8s.io/client-go/util/integer"
42-
"k8s.io/kubernetes/pkg/api"
4343
internalextensions "k8s.io/kubernetes/pkg/apis/extensions"
4444
"k8s.io/kubernetes/pkg/controller"
4545
labelsutil "k8s.io/kubernetes/pkg/util/labels"
@@ -635,12 +635,12 @@ func ListPods(deployment *extensions.Deployment, rsList []*extensions.ReplicaSet
635635
// (e.g. the addition of a new field will cause the hash code to change)
636636
// Note that we assume input podTemplateSpecs contain non-empty labels
637637
func EqualIgnoreHash(template1, template2 *v1.PodTemplateSpec) (bool, error) {
638-
cp, err := api.Scheme.DeepCopy(template1)
638+
cp, err := scheme.Scheme.DeepCopy(template1)
639639
if err != nil {
640640
return false, err
641641
}
642642
t1Copy := cp.(*v1.PodTemplateSpec)
643-
cp, err = api.Scheme.DeepCopy(template2)
643+
cp, err = scheme.Scheme.DeepCopy(template2)
644644
if err != nil {
645645
return false, err
646646
}
@@ -978,7 +978,7 @@ func ResolveFenceposts(maxSurge, maxUnavailable *intstrutil.IntOrString, desired
978978
}
979979

980980
func DeploymentDeepCopy(deployment *extensions.Deployment) (*extensions.Deployment, error) {
981-
objCopy, err := api.Scheme.DeepCopy(deployment)
981+
objCopy, err := scheme.Scheme.DeepCopy(deployment)
982982
if err != nil {
983983
return nil, err
984984
}

‎pkg/controller/deployment/util/deployment_util_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"k8s.io/apimachinery/pkg/types"
3434
"k8s.io/apimachinery/pkg/util/intstr"
3535
"k8s.io/client-go/kubernetes/fake"
36+
"k8s.io/client-go/kubernetes/scheme"
3637
core "k8s.io/client-go/testing"
37-
"k8s.io/kubernetes/pkg/api"
3838
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
3939
"k8s.io/kubernetes/pkg/controller"
4040
)
@@ -185,7 +185,7 @@ func newDControllerRef(d *extensions.Deployment) *metav1.OwnerReference {
185185

186186
// generateRS creates a replica set, with the input deployment's template as its template
187187
func generateRS(deployment extensions.Deployment) extensions.ReplicaSet {
188-
cp, _ := api.Scheme.DeepCopy(deployment.Spec.Template)
188+
cp, _ := scheme.Scheme.DeepCopy(deployment.Spec.Template)
189189
template := cp.(v1.PodTemplateSpec)
190190
return extensions.ReplicaSet{
191191
ObjectMeta: metav1.ObjectMeta{

‎pkg/controller/deployment/util/pod_util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121

2222
"k8s.io/api/core/v1"
2323
errorsutil "k8s.io/apimachinery/pkg/util/errors"
24+
"k8s.io/client-go/kubernetes/scheme"
2425
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
2526
corelisters "k8s.io/client-go/listers/core/v1"
26-
"k8s.io/kubernetes/pkg/api"
2727
"k8s.io/kubernetes/pkg/client/retry"
2828
)
2929

@@ -42,7 +42,7 @@ func UpdatePodWithRetries(podClient v1core.PodInterface, podLister corelisters.P
4242
if err != nil {
4343
return err
4444
}
45-
obj, deepCopyErr := api.Scheme.DeepCopy(pod)
45+
obj, deepCopyErr := scheme.Scheme.DeepCopy(pod)
4646
if deepCopyErr != nil {
4747
return deepCopyErr
4848
}

‎pkg/controller/deployment/util/replicaset_util.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"k8s.io/api/core/v1"
2525
extensions "k8s.io/api/extensions/v1beta1"
2626
errorsutil "k8s.io/apimachinery/pkg/util/errors"
27+
"k8s.io/client-go/kubernetes/scheme"
2728
unversionedextensions "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
2829
extensionslisters "k8s.io/client-go/listers/extensions/v1beta1"
29-
"k8s.io/kubernetes/pkg/api"
3030
"k8s.io/kubernetes/pkg/client/retry"
3131
"k8s.io/kubernetes/pkg/controller"
3232
labelsutil "k8s.io/kubernetes/pkg/util/labels"
@@ -47,7 +47,7 @@ func UpdateRSWithRetries(rsClient unversionedextensions.ReplicaSetInterface, rsL
4747
if err != nil {
4848
return err
4949
}
50-
obj, deepCopyErr := api.Scheme.DeepCopy(rs)
50+
obj, deepCopyErr := scheme.Scheme.DeepCopy(rs)
5151
if deepCopyErr != nil {
5252
return deepCopyErr
5353
}
@@ -71,7 +71,7 @@ func UpdateRSWithRetries(rsClient unversionedextensions.ReplicaSetInterface, rsL
7171

7272
// GetReplicaSetHash returns the pod template hash of a ReplicaSet's pod template space
7373
func GetReplicaSetHash(rs *extensions.ReplicaSet, uniquifier *int64) (string, error) {
74-
template, err := api.Scheme.DeepCopy(rs.Spec.Template)
74+
template, err := scheme.Scheme.DeepCopy(rs.Spec.Template)
7575
if err != nil {
7676
return "", err
7777
}

‎pkg/controller/disruption/BUILD

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ go_library(
1313
srcs = ["disruption.go"],
1414
tags = ["automanaged"],
1515
deps = [
16-
"//pkg/api:go_default_library",
1716
"//pkg/api/v1/pod:go_default_library",
1817
"//pkg/controller:go_default_library",
1918
"//vendor/github.com/golang/glog:go_default_library",
@@ -32,6 +31,7 @@ go_library(
3231
"//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library",
3332
"//vendor/k8s.io/client-go/informers/policy/v1beta1:go_default_library",
3433
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
34+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
3535
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
3636
"//vendor/k8s.io/client-go/kubernetes/typed/policy/v1beta1:go_default_library",
3737
"//vendor/k8s.io/client-go/listers/apps/v1beta1:go_default_library",
@@ -62,6 +62,7 @@ go_test(
6262
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
6363
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
6464
"//vendor/k8s.io/client-go/informers:go_default_library",
65+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
6566
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
6667
"//vendor/k8s.io/client-go/util/workqueue:go_default_library",
6768
],

0 commit comments

Comments
 (0)