github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38823 from bprashanth/svc_error_eater 

Automatic merge from submit-queue

Don't eat 403 in service controller

I haven't done a stress run of Services e2es locally yet, but I did verify that this fixes the specific "stuck in pending bug"
pull/6/head
Kubernetes Submit Queue 2016-12-15 12:33:55 -08:00 committed by GitHub
parent 32946c5bd0 98c7fe98e1
commit 6b72259320
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,12 +324,10 @@ func (s *ServiceController) persistUpdate(service *v1.Service) error {
return nil
}
// TODO: Try to resolve the conflict if the change was unrelated to load
// balancer status. For now, just rely on the fact that we'll
// also process the update that caused the resource version to change.
// balancer status. For now, just pass it up the stack.
if errors.IsConflict(err) {
glog.Warningf("Not persisting update to service '%s/%s' that has been changed since we received it: %v",
return fmt.Errorf("Not persisting update to service '%s/%s' that has been changed since we received it: %v",
service.Namespace, service.Name, err)
return nil
}
glog.Warningf("Failed to persist updated LoadBalancerStatus to service '%s/%s' after creating its load balancer: %v",
service.Namespace, service.Name, err)