From 3fe7a570001ae0a6773da34a2eee7246ef416094 Mon Sep 17 00:00:00 2001 From: Yassine TIJANI Date: Mon, 19 Aug 2019 16:11:59 +0100 Subject: [PATCH] use directly DeletionHandlingMetaNamespaceKeyFunc from client-go Signed-off-by: Yassine TIJANI --- pkg/controller/service/BUILD | 1 - pkg/controller/service/service_controller.go | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/controller/service/BUILD b/pkg/controller/service/BUILD index e62a8a7449c..747c3d1acd9 100644 --- a/pkg/controller/service/BUILD +++ b/pkg/controller/service/BUILD @@ -16,7 +16,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/controller/service", deps = [ "//pkg/apis/core/v1/helper:go_default_library", - "//pkg/controller:go_default_library", "//pkg/util/metrics:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go index e9c51c557d0..3e24e387d10 100644 --- a/pkg/controller/service/service_controller.go +++ b/pkg/controller/service/service_controller.go @@ -42,7 +42,6 @@ import ( servicehelper "k8s.io/cloud-provider/service/helpers" "k8s.io/klog" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" ) @@ -195,7 +194,7 @@ func New( // obj could be an *v1.Service, or a DeletionFinalStateUnknown marker item. func (s *ServiceController) enqueueService(obj interface{}) { - key, err := controller.KeyFunc(obj) + key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj) if err != nil { runtime.HandleError(fmt.Errorf("couldn't get key for object %#v: %v", obj, err)) return