From d4210b94e25cc6b06f5b1072a52f854efbc0a8b6 Mon Sep 17 00:00:00 2001 From: Pavithra Ramesh Date: Tue, 30 Jul 2019 15:21:52 -0700 Subject: [PATCH] addressed review comments --- pkg/controller/service/service_controller.go | 9 +++++---- staging/src/k8s.io/cloud-provider/cloud.go | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go index ffba3de7873..91204bad6d6 100644 --- a/pkg/controller/service/service_controller.go +++ b/pkg/controller/service/service_controller.go @@ -340,7 +340,8 @@ func (s *ServiceController) syncLoadBalancerIfNeeded(service *v1.Service, key st newStatus, err = s.ensureLoadBalancer(service) if err != nil { if err == cloudprovider.ImplementedElsewhere { - klog.Infof("LoadBalancer for service %s not implemented by alternate controller %s, Ignoring error", key, s.cloud.ProviderName()) + klog.Infof("LoadBalancer for service %s implemented by a different controller %s, Ignoring error", + key, s.cloud.ProviderName()) return op, nil } return op, fmt.Errorf("failed to ensure load balancer: %v", err) @@ -708,9 +709,9 @@ func (s *ServiceController) lockedUpdateLoadBalancerHosts(service *v1.Service, h return nil } if err == cloudprovider.ImplementedElsewhere { - // Skip error since LoadBalancer implementation is in some other controller. In this case, the loadBalancer will likely not - // exist and will be handled in the if block below. Adding this check in case the alternate loadBalancer implementation - // uses the same naming scheme. + // ImplementedElsewhere indicates that the UpdateLoadBalancer is a nop and the + // functionality is implemented by a different controller. In this case, we + // return immediately without doing anything. return nil } // It's only an actual error if the load balancer still exists. diff --git a/staging/src/k8s.io/cloud-provider/cloud.go b/staging/src/k8s.io/cloud-provider/cloud.go index 5da25c1f27d..164d2f4fd71 100644 --- a/staging/src/k8s.io/cloud-provider/cloud.go +++ b/staging/src/k8s.io/cloud-provider/cloud.go @@ -199,10 +199,10 @@ type Routes interface { } var ( - InstanceNotFound = errors.New("instance not found") DiskNotFound = errors.New("disk is not found") - NotImplemented = errors.New("unimplemented") ImplementedElsewhere = errors.New("Implemented by a different controller") + InstanceNotFound = errors.New("instance not found") + NotImplemented = errors.New("unimplemented") ) // Zone represents the location of a particular machine.