From a532784189b85035fac5c1bb762daae9fedc4494 Mon Sep 17 00:00:00 2001 From: Yassine TIJANI Date: Tue, 8 Aug 2017 12:51:45 +0200 Subject: [PATCH] simplify logic around LB deletion --- pkg/controller/service/service_controller.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go index 0a3417474ea..52f3c64998a 100644 --- a/pkg/controller/service/service_controller.go +++ b/pkg/controller/service/service_controller.go @@ -261,16 +261,11 @@ func (s *ServiceController) createLoadBalancerIfNeeded(key string, service *v1.S var err error if !wantsLoadBalancer(service) { - needDelete := true _, exists, err := s.balancer.GetLoadBalancer(s.clusterName, service) if err != nil { return fmt.Errorf("Error getting LB for service %s: %v", key, err), retryable } - if !exists { - needDelete = false - } - - if needDelete { + if exists { glog.Infof("Deleting existing load balancer for service %s that no longer needs a load balancer.", key) s.eventRecorder.Event(service, v1.EventTypeNormal, "DeletingLoadBalancer", "Deleting load balancer") if err := s.balancer.EnsureLoadBalancerDeleted(s.clusterName, service); err != nil {