Skip to content

Commit

Permalink
Merge pull request kubernetes#25155 from roberthbailey/automated-cher…
Browse files Browse the repository at this point in the history
…ry-pick-of-#24833-upstream-release-1.2

Automated cherry pick of kubernetes#24833 upstream release 1.2
  • Loading branch information
roberthbailey committed May 5, 2016
2 parents 3a618b6 + ecdcbcc commit 062ab51
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/controller/service/servicecontroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, time.Durati
namespacedName.Name = deltaService.Name
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
// service.
Expand All @@ -250,7 +250,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, time.Durati
return err, cachedService.nextRetryDelay()
} else if errors.IsNotFound(err) {
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(s.loadBalancerName(deltaService), s.zone.Region)
if err != nil {
message := "Error deleting load balancer (will retry): " + err.Error()
Expand Down

0 comments on commit 062ab51

Please sign in to comment.