From e23f1d5bb4ca7888ff32bd26fd8380bcdd1deeb2 Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Fri, 14 Apr 2017 15:22:19 +0530 Subject: [PATCH] Use ObjectGetter Interface instead of clientset.Interface for leaderelection pkg --- pkg/client/leaderelection/BUILD | 2 +- pkg/client/leaderelection/leaderelection_test.go | 4 ++-- pkg/client/leaderelection/resourcelock/BUILD | 2 +- .../leaderelection/resourcelock/configmaplock.go | 10 +++++----- .../leaderelection/resourcelock/endpointslock.go | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/client/leaderelection/BUILD b/pkg/client/leaderelection/BUILD index e11f45a5c17..796151b02f2 100644 --- a/pkg/client/leaderelection/BUILD +++ b/pkg/client/leaderelection/BUILD @@ -31,7 +31,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/clientset_generated/clientset/typed/core/v1/fake:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/client/leaderelection/leaderelection_test.go b/pkg/client/leaderelection/leaderelection_test.go index fd68856b43f..31383375cce 100644 --- a/pkg/client/leaderelection/leaderelection_test.go +++ b/pkg/client/leaderelection/leaderelection_test.go @@ -28,7 +28,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/v1" - fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" + fakecorev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1/fake" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" ) @@ -219,7 +219,7 @@ func testTryAcquireOrRenew(t *testing.T, objectType string) { Identity: "baz", EventRecorder: &record.FakeRecorder{}, } - c := &fakeclientset.Clientset{Fake: core.Fake{}} + c := &fakecorev1.FakeCoreV1{Fake: &core.Fake{}} for _, reactor := range test.reactors { c.AddReactor(reactor.verb, objectType, reactor.reaction) } diff --git a/pkg/client/leaderelection/resourcelock/BUILD b/pkg/client/leaderelection/resourcelock/BUILD index 188c6f7d5cc..4a1d287e525 100644 --- a/pkg/client/leaderelection/resourcelock/BUILD +++ b/pkg/client/leaderelection/resourcelock/BUILD @@ -17,7 +17,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/client-go/tools/record:go_default_library", ], diff --git a/pkg/client/leaderelection/resourcelock/configmaplock.go b/pkg/client/leaderelection/resourcelock/configmaplock.go index 20aaf3625a6..805c1c5f148 100644 --- a/pkg/client/leaderelection/resourcelock/configmaplock.go +++ b/pkg/client/leaderelection/resourcelock/configmaplock.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" ) // TODO: This is almost a exact replica of Endpoints lock. @@ -35,7 +35,7 @@ type ConfigMapLock struct { // ConfigMapMeta should contain a Name and a Namespace of an // ConfigMapMeta object that the Leadercmlector will attempt to lead. ConfigMapMeta metav1.ObjectMeta - Client clientset.Interface + Client corev1client.ConfigMapsGetter LockConfig ResourceLockConfig cm *v1.ConfigMap } @@ -44,7 +44,7 @@ type ConfigMapLock struct { func (cml *ConfigMapLock) Get() (*LeaderElectionRecord, error) { var record LeaderElectionRecord var err error - cml.cm, err = cml.Client.Core().ConfigMaps(cml.ConfigMapMeta.Namespace).Get(cml.ConfigMapMeta.Name, metav1.GetOptions{}) + cml.cm, err = cml.Client.ConfigMaps(cml.ConfigMapMeta.Namespace).Get(cml.ConfigMapMeta.Name, metav1.GetOptions{}) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func (cml *ConfigMapLock) Create(ler LeaderElectionRecord) error { if err != nil { return err } - cml.cm, err = cml.Client.Core().ConfigMaps(cml.ConfigMapMeta.Namespace).Create(&v1.ConfigMap{ + cml.cm, err = cml.Client.ConfigMaps(cml.ConfigMapMeta.Namespace).Create(&v1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: cml.ConfigMapMeta.Name, Namespace: cml.ConfigMapMeta.Namespace, @@ -87,7 +87,7 @@ func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error { return err } cml.cm.Annotations[LeaderElectionRecordAnnotationKey] = string(recordBytes) - cml.cm, err = cml.Client.Core().ConfigMaps(cml.ConfigMapMeta.Namespace).Update(cml.cm) + cml.cm, err = cml.Client.ConfigMaps(cml.ConfigMapMeta.Namespace).Update(cml.cm) return err } diff --git a/pkg/client/leaderelection/resourcelock/endpointslock.go b/pkg/client/leaderelection/resourcelock/endpointslock.go index 215c3b65525..d39f32d406b 100644 --- a/pkg/client/leaderelection/resourcelock/endpointslock.go +++ b/pkg/client/leaderelection/resourcelock/endpointslock.go @@ -23,14 +23,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" ) type EndpointsLock struct { // EndpointsMeta should contain a Name and a Namespace of an // Endpoints object that the LeaderElector will attempt to lead. EndpointsMeta metav1.ObjectMeta - Client clientset.Interface + Client corev1client.EndpointsGetter LockConfig ResourceLockConfig e *v1.Endpoints } @@ -39,7 +39,7 @@ type EndpointsLock struct { func (el *EndpointsLock) Get() (*LeaderElectionRecord, error) { var record LeaderElectionRecord var err error - el.e, err = el.Client.Core().Endpoints(el.EndpointsMeta.Namespace).Get(el.EndpointsMeta.Name, metav1.GetOptions{}) + el.e, err = el.Client.Endpoints(el.EndpointsMeta.Namespace).Get(el.EndpointsMeta.Name, metav1.GetOptions{}) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (el *EndpointsLock) Create(ler LeaderElectionRecord) error { if err != nil { return err } - el.e, err = el.Client.Core().Endpoints(el.EndpointsMeta.Namespace).Create(&v1.Endpoints{ + el.e, err = el.Client.Endpoints(el.EndpointsMeta.Namespace).Create(&v1.Endpoints{ ObjectMeta: metav1.ObjectMeta{ Name: el.EndpointsMeta.Name, Namespace: el.EndpointsMeta.Namespace, @@ -82,7 +82,7 @@ func (el *EndpointsLock) Update(ler LeaderElectionRecord) error { return err } el.e.Annotations[LeaderElectionRecordAnnotationKey] = string(recordBytes) - el.e, err = el.Client.Core().Endpoints(el.EndpointsMeta.Namespace).Update(el.e) + el.e, err = el.Client.Endpoints(el.EndpointsMeta.Namespace).Update(el.e) return err }