Skip to content

K
k3s
Commit ed159319 authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

Fix DeletingLoadBalancer event generation.

Also patch up a log statement to log the service's namespace and name rather than potentially just logging `kind:"" apiVersion:""`.
parent 3b09c641
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/controller/service/servicecontroller.go
View file @ ed159319
...@@ -232,7 +232,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, time.Durati ...@@ -232,7 +232,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, time.Durati
namespacedName.Name = deltaService.Name namespacedName.Name = deltaService.Name
cachedService = s.cache.getOrCreate(namespacedName.String()) cachedService = s.cache.getOrCreate(namespacedName.String())
} }
glog.V(2).Infof("Got new %s delta for service: %+v", delta.Type, deltaService) glog.V(2).Infof("Got new %s delta for service: %v", delta.Type, namespacedName)
// Ensure that no other goroutine will interfere with our processing of the // Ensure that no other goroutine will interfere with our processing of the
// service. // service.
...@@ -249,7 +249,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, time.Durati ...@@ -249,7 +249,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, time.Durati
return err, cachedService.nextRetryDelay() return err, cachedService.nextRetryDelay()
} else if errors.IsNotFound(err) { } else if errors.IsNotFound(err) {
glog.V(2).Infof("Service %v not found, ensuring load balancer is deleted", namespacedName) glog.V(2).Infof("Service %v not found, ensuring load balancer is deleted", namespacedName)
s.eventRecorder.Event(service, api.EventTypeNormal, "DeletingLoadBalancer", "Deleting load balancer") s.eventRecorder.Event(deltaService, api.EventTypeNormal, "DeletingLoadBalancer", "Deleting load balancer")
err := s.balancer.EnsureLoadBalancerDeleted(deltaService) err := s.balancer.EnsureLoadBalancerDeleted(deltaService)
if err != nil { if err != nil {
message := "Error deleting load balancer (will retry): " + err.Error() message := "Error deleting load balancer (will retry): " + err.Error()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment