github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

addressed review comments

Browse Source
This commit is contained in:
Pavithra Ramesh 2019-07-30 15:21:52 -07:00
parent 8382906c9d
commit d4210b94e2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/service/service_controller.go
View File

@ -340,7 +340,8 @@ func (s *ServiceController) syncLoadBalancerIfNeeded(service *v1.Service, key st
newStatus, err = s.ensureLoadBalancer(service) newStatus, err = s.ensureLoadBalancer(service)
if err != nil { if err != nil {
if err == cloudprovider.ImplementedElsewhere { 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, nil
} }
return op, fmt.Errorf("failed to ensure load balancer: %v", err) 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 return nil
} }
if err == cloudprovider.ImplementedElsewhere { if err == cloudprovider.ImplementedElsewhere {
// Skip error since LoadBalancer implementation is in some other controller. In this case, the loadBalancer will likely not // ImplementedElsewhere indicates that the UpdateLoadBalancer is a nop and the
// exist and will be handled in the if block below. Adding this check in case the alternate loadBalancer implementation // functionality is implemented by a different controller. In this case, we
// uses the same naming scheme. // return immediately without doing anything.
return nil return nil
} }
// It's only an actual error if the load balancer still exists. // It's only an actual error if the load balancer still exists.

4
staging/src/k8s.io/cloud-provider/cloud.go
View File

@ -199,10 +199,10 @@ type Routes interface {
} }
var ( var (
InstanceNotFound = errors.New("instance not found")
DiskNotFound = errors.New("disk is not found") DiskNotFound = errors.New("disk is not found")
NotImplemented = errors.New("unimplemented")
ImplementedElsewhere = errors.New("Implemented by a different controller") 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. // Zone represents the location of a particular machine.