kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15902 from borg-land/gce-sva-bug-fix 

Handle 404 properly from Service Accounts API
This commit is contained in:
Kubernetes Prow Robot 2023-09-11 11:48:11 -07:00 committed by GitHub
parent 2cba9dd208 352566cf42
commit e834be956a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/resources/gce/gce.go
View File

@ -377,10 +377,10 @@ func deleteGCEDisk(cloud fi.Cloud, r *resources.Resource) error {
op, err := c.Compute().Disks().Delete(u.Project, u.Zone, u.Name)
if err != nil {
if gce.IsNotFound(err) {
klog.Infof("disk not found, assuming deleted: %q", t.SelfLink)
klog.Infof("Disk not found, assuming deleted: %q", t.SelfLink)
return nil
}
return fmt.Errorf("error deleting disk %s: %v", t.SelfLink, err)
return fmt.Errorf("error deleting Disk %s: %v", t.SelfLink, err)
}
return c.WaitForOp(op)
@ -930,7 +930,7 @@ func deleteSubnet(cloud fi.Cloud, r *resources.Resource) error {
c := cloud.(gce.GCECloud)
o := r.Obj.(*compute.Subnetwork)
klog.V(2).Infof("deleting GCE subnetwork %s", o.SelfLink)
klog.V(2).Infof("deleting GCE Subnetwork %s", o.SelfLink)
u, err := gce.ParseGoogleCloudURL(o.SelfLink)
if err != nil {
return err
@ -939,10 +939,10 @@ func deleteSubnet(cloud fi.Cloud, r *resources.Resource) error {
op, err := c.Compute().Subnetworks().Delete(u.Project, u.Region, u.Name)
if err != nil {
if gce.IsNotFound(err) {
klog.Infof("subnetwork not found, assuming deleted: %q", o.SelfLink)
klog.Infof("Subnetwork not found, assuming deleted: %q", o.SelfLink)
return nil
}
return fmt.Errorf("error deleting subnetwork %s: %v", o.SelfLink, err)
return fmt.Errorf("error deleting Subnetwork %s: %v", o.SelfLink, err)
}
return c.WaitForOp(op)
@ -993,7 +993,7 @@ func deleteRouter(cloud fi.Cloud, r *resources.Resource) error {
op, err := c.Compute().Routers().Delete(u.Project, u.Region, u.Name)
if err != nil {
if gce.IsNotFound(err) {
klog.Infof("router not found, assuming deleted: %q", o.SelfLink)
klog.Infof("Router not found, assuming deleted: %q", o.SelfLink)
return nil
}
return fmt.Errorf("error deleting router %s: %v", o.SelfLink, err)
@ -1044,7 +1044,14 @@ func deleteServiceAccount(cloud fi.Cloud, r *resources.Resource) error {
klog.V(2).Infof("deleting GCE ServiceAccount %s", o.Name)
_, err := c.IAM().ServiceAccounts().Delete(o.Name)
return err
if err != nil {
if gce.IsNotFound(err) {
klog.Infof("ServiceAccount not found, assuming deleted: %q", o.Name)
return nil
}
return fmt.Errorf("error deleting ServiceAccount %s: %v", o.Name, err)
}
return nil
}
// containsOnlyListedIGMs returns true if all the given backend service's backends