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

Merge pull request #76108 from MrHohn/svc-controller-sync-name

Browse Source 
Rename createLoadBalancerIfNeeded() to syncLoadBalancerIfNeeded()
This commit is contained in:
Kubernetes Prow Robot 2019-04-04 00:41:27 -07:00 committed by GitHub
commit 79a8827c37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,7 +248,7 @@ func (s *ServiceController) processServiceUpdate(cachedService *cachedService, s
} }
// cache the service, we need the info for service deletion // cache the service, we need the info for service deletion
cachedService.state = service cachedService.state = service
err := s.createLoadBalancerIfNeeded(key, service) err := s.syncLoadBalancerIfNeeded(key, service)
if err != nil { if err != nil {
eventType := "CreatingLoadBalancerFailed" eventType := "CreatingLoadBalancerFailed"
message := "Error creating load balancer (will retry): " message := "Error creating load balancer (will retry): "
@ -269,10 +269,10 @@ func (s *ServiceController) processServiceUpdate(cachedService *cachedService, s
return nil return nil
} }
// createLoadBalancerIfNeeded ensures that service's status is synced up with loadbalancer // syncLoadBalancerIfNeeded ensures that service's status is synced up with loadbalancer
// i.e. creates loadbalancer for service if requested and deletes loadbalancer if the service // i.e. creates loadbalancer for service if requested and deletes loadbalancer if the service
// doesn't want a loadbalancer no more. Returns whatever error occurred. // doesn't want a loadbalancer no more. Returns whatever error occurred.
func (s *ServiceController) createLoadBalancerIfNeeded(key string, service *v1.Service) error { func (s *ServiceController) syncLoadBalancerIfNeeded(key string, service *v1.Service) error {
// Note: It is safe to just call EnsureLoadBalancer. But, on some clouds that requires a delete & create, // Note: It is safe to just call EnsureLoadBalancer. But, on some clouds that requires a delete & create,
// which may involve service interruption. Also, we would like user-friendly events. // which may involve service interruption. Also, we would like user-friendly events.

2
pkg/controller/service/service_controller_test.go
View File

@ -151,7 +151,7 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
for _, item := range table { for _, item := range table {
controller, cloud, client := newController() controller, cloud, client := newController()
err := controller.createLoadBalancerIfNeeded("foo/bar", item.service) err := controller.syncLoadBalancerIfNeeded("foo/bar", item.service)
if !item.expectErr && err != nil { if !item.expectErr && err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} else if item.expectErr && err == nil { } else if item.expectErr && err == nil {