storytold/irsa-manager
2
0
Fork 0
mirror of https://github.com/storytold/irsa-manager.git synced 2026-10-21 07:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

no update (secret)

Browse Source
This commit is contained in:
kkb0318
2024-04-14 20:44:02 +09:00
parent dcc01e17bd
commit 993b08a204
9 changed files with 76 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/kubernetes/delete.go
+3 -10
View File
@@ -8,7 +8,6 @@ import (
"github.com/kkb0318/irsa-manager/internal/handler"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -16,13 +15,7 @@ import (
// Delete deletes the given object (not found errors are ignored).
func (h *KubernetesClient) Delete(ctx context.Context, obj client.Object, opts handler.DeleteOptions) error {
u, err := h.toUnstructured(obj)
if err != nil {
return err
}
existingObject := &unstructured.Unstructured{}
existingObject.SetGroupVersionKind(u.GroupVersionKind())
err = h.client.Get(ctx, client.ObjectKeyFromObject(u), existingObject)
existingObj, err := h.Get(ctx, obj)
if err != nil {
if !errors.IsNotFound(err) {
return fmt.Errorf("failed to delete: %w", err)
@@ -35,11 +28,11 @@ func (h *KubernetesClient) Delete(ctx context.Context, obj client.Object, opts h
return fmt.Errorf("label selector failed: %w", err)
}
if !sel.Matches(labels.Set(existingObject.GetLabels())) {
if !sel.Matches(labels.Set(existingObj.GetLabels())) {
return nil
}
if err := h.client.Delete(ctx, existingObject, client.PropagationPolicy(opts.DeletionPropagation)); err != nil {
if err := h.client.Delete(ctx, existingObj, client.PropagationPolicy(opts.DeletionPropagation)); err != nil {
return fmt.Errorf("delete failed: %w", err)
}