Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions pkg/resources/gce/errors.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
Copyright 2024 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package gce

import (
"errors"

"google.golang.org/api/googleapi"
"k8s.io/klog/v2"
)

// AsGoogleAPIError returns a googleapi.Error in the error chain, or false if none is found.
func AsGoogleAPIError(err error) (*googleapi.Error, bool) {
var googleAPIError *googleapi.Error
if errors.As(err, &googleAPIError) {
return googleAPIError, true
} else {
return nil, false
}
}

// IsDependencyViolation checks if the error is a dependency violation.
func IsDependencyViolation(err error) bool {
apiErr, ok := AsGoogleAPIError(err)
if !ok {
return false
}

for _, e := range apiErr.Errors {
switch e.Reason {
case "resourceInUseByAnotherResource":
return true
default:
klog.Infof("unexpected gce error code: %+v", e)
}
}

return false
}
3 changes: 2 additions & 1 deletion pkg/resources/ops/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/kops/pkg/resources"
awsresources "k8s.io/kops/pkg/resources/aws"
gceresources "k8s.io/kops/pkg/resources/gce"
"k8s.io/kops/upup/pkg/fi"
)

Expand Down Expand Up @@ -128,7 +129,7 @@ func DeleteResources(cloud fi.Cloud, resourceMap map[string]*resources.Resource,
}
if err != nil {
mutex.Lock()
if awsresources.IsDependencyViolation(err) {
if awsresources.IsDependencyViolation(err) || gceresources.IsDependencyViolation(err) {
fmt.Printf("%s\tstill has dependencies, will retry\n", human)
klog.V(4).Infof("resource %q generated a dependency error: %v", human, err)
} else {
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/gce/wrappers.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func DeleteInstanceGroupManager(c GCECloud, t *compute.InstanceGroupManager) err
klog.Infof("InstanceGroupManager not found, assuming deleted: %q", t.SelfLink)
return nil
}
return fmt.Errorf("error deleting InstanceGroupManager %s: %v", t.SelfLink, err)
return fmt.Errorf("error deleting InstanceGroupManager %s: %w", t.SelfLink, err)
}

return c.WaitForOp(op)
Expand All @@ -58,7 +58,7 @@ func DeleteInstanceTemplate(c GCECloud, selfLink string) error {
klog.Infof("instancetemplate not found, assuming deleted: %q", selfLink)
return nil
}
return fmt.Errorf("error deleting InstanceTemplate %s: %v", selfLink, err)
return fmt.Errorf("error deleting InstanceTemplate %s: %w", selfLink, err)
}

return c.WaitForOp(op)
Expand All @@ -78,7 +78,7 @@ func DeleteInstance(c GCECloud, instanceSelfLink string) error {
klog.Infof("Instance not found, assuming deleted: %q", instanceSelfLink)
return nil
}
return fmt.Errorf("error deleting Instance %s: %v", instanceSelfLink, err)
return fmt.Errorf("error deleting Instance %s: %w", instanceSelfLink, err)
}

return c.WaitForOp(op)
Expand All @@ -100,7 +100,7 @@ func ListManagedInstances(c GCECloud, igm *compute.InstanceGroupManager) ([]*com

instances, err := c.Compute().InstanceGroupManagers().ListManagedInstances(ctx, project, zoneName, igm.Name)
if err != nil {
return nil, fmt.Errorf("error listing ManagedInstances in %s: %v", igm.Name, err)
return nil, fmt.Errorf("error listing ManagedInstances in %s: %w", igm.Name, err)
}

return instances, nil
Expand Down
Loading