Skip to content

Commit e820301

Browse files
authored
Merge pull request #18195 from rifelpet/gce-panic
Fix nil panic during GCE deletion
2 parents 80453cc + 986aa86 commit e820301

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

pkg/resources/gce/gce.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ func (d *clusterDiscoveryGCE) listBackendServices() ([]*resources.Resource, erro
10971097
op, err := c.Compute().RegionBackendServices().Delete(c.Project(), c.Region(), svc.Name)
10981098
if err != nil {
10991099
if gce.IsNotFound(err) {
1100-
klog.Infof("BackendService not found, assuming deleted: %q", op.SelfLink)
1100+
klog.Infof("BackendService not found, assuming deleted: %q", r.Name)
11011101
return nil
11021102
}
11031103
return err
@@ -1141,7 +1141,7 @@ func (d *clusterDiscoveryGCE) listHealthchecks() ([]*resources.Resource, error)
11411141
op, err := c.Compute().RegionHealthChecks().Delete(c.Project(), c.Region(), gce.LastComponent(hc))
11421142
if err != nil {
11431143
if gce.IsNotFound(err) {
1144-
klog.Infof("Healthcheck not found, assuming deleted: %q", op.SelfLink)
1144+
klog.Infof("Healthcheck not found, assuming deleted: %q", r.Name)
11451145
return nil
11461146
}
11471147
return err

0 commit comments

Comments
 (0)