github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate api.Scheme to scheme.Scheme

Browse Source
This commit is contained in:
Jacob Simpson
2017-07-10 10:54:48 -07:00
parent 2c70e5df35
commit a765b8cfca
53 changed files with 128 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/replication/replication_controller.go
View File

@@ -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
}