Skip to content

K
k3s
Unverified Commit 6851e6ab authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #56344 from gmarek/gce-lb-fix-19

Automatic merge from submit-queue (batch tested with PRs 56344, 56473). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix panic in GCE loadbalancer library
parents 24042ce6 94b6a1fb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go
View file @ 6851e6ab
...@@ -344,7 +344,10 @@ func (gce *GCECloud) ensureExternalLoadBalancerDeleted(clusterName, clusterID st ...@@ -344,7 +344,10 @@ func (gce *GCECloud) ensureExternalLoadBalancerDeleted(clusterName, clusterID st
glog.Infof("ensureExternalLoadBalancerDeleted(%s): Failed to retrieve health check:%v.", lbRefStr, err) glog.Infof("ensureExternalLoadBalancerDeleted(%s): Failed to retrieve health check:%v.", lbRefStr, err)
return err return err
} }
hcNames = append(hcNames, hcToDelete.Name) // If we got 'StatusNotFound' LB was already deleted and it's safe to ignore.
if err == nil {
hcNames = append(hcNames, hcToDelete.Name)
}
} else { } else {
// EnsureLoadBalancerDeleted() could be triggered by changing service from // EnsureLoadBalancerDeleted() could be triggered by changing service from
// LoadBalancer type to others. In this case we have no idea whether it was // LoadBalancer type to others. In this case we have no idea whether it was
......
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