From fe4c4ac55d2b5e67fd22d459a091a5f5529d5a34 Mon Sep 17 00:00:00 2001
From: Yauheni Kaliuta <ykaliuta@redhat.com>
Date: Fri, 26 Apr 2024 14:52:43 +0300
Subject: [PATCH] pkg/upgrade: convert RemoveLabel to Action

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
---
 pkg/upgrade/upgrade.go | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go
index 547e0bdd5ea..2da53c237d6 100644
--- a/pkg/upgrade/upgrade.go
+++ b/pkg/upgrade/upgrade.go
@@ -414,18 +414,12 @@ func deleteResource(cli client.Client, namespace string, resourceType string) er
 }
 
 func RemoveLabel(cli client.Client, objectName string, labelKey string) error {
-	foundNamespace := &corev1.Namespace{}
-	if err := cli.Get(context.TODO(), client.ObjectKey{Name: objectName}, foundNamespace); err != nil {
-		if apierrs.IsNotFound(err) {
-			return nil
-		}
-		return fmt.Errorf("could not get %s namespace: %w", objectName, err)
-	}
-	delete(foundNamespace.Labels, labelKey)
-	if err := cli.Update(context.TODO(), foundNamespace); err != nil {
-		return fmt.Errorf("error removing %s from %s : %w", labelKey, objectName, err)
-	}
-	return nil
+	return action.NewDeleteLabel(cli, labelKey).
+		Exec(context.TODO(), action.ResourceSpec{
+			Gvk:    gvk.Namespace,
+			Path:   []string{"metadata", "name"},
+			Values: []string{objectName},
+		})
 }
 
 func deleteDeprecatedNamespace(ctx context.Context, cli client.Client, namespace string) error {