test(upgrade): remove finalizers using kubectl from all objects in the namespace

Author: vrutkovs

test/e2e/upgrade/upgrade_test.go

@@ -55,7 +55,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
 		Eventually(func() bool {
 			err := k8sClient.Get(ctx, types.NamespacedName{Name: namespace}, &corev1.Namespace{})
 			return k8serrors.IsNotFound(err)
-		}, 60*time.Second, 2*time.Second).Should(BeTrue())
+		}, 5*time.Minute, 5*time.Second).Should(BeTrue())
 		err := k8sClient.Create(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace}})
 		Expect(err).ToNot(HaveOccurred())
 		deployOldOperator(ctx, k8sClient, tc.operatorVersion, namespace)
@@ -162,7 +162,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
 		Eventually(func() bool {
 			err := k8sClient.Get(ctx, types.NamespacedName{Name: namespace}, &corev1.Namespace{})
 			return k8serrors.IsNotFound(err)
-		}, 60*time.Second, 2*time.Second).Should(BeTrue())
+		}, 5*time.Minute, 5*time.Second).Should(BeTrue())
 		err := k8sClient.Create(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace}})
 		Expect(err).ToNot(HaveOccurred())
 		deployOldOperator(ctx, k8sClient, tc.operatorVersion, namespace)

test/e2e/upgrade/utils.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"os/exec"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2" //nolint:staticcheck
@@ -19,7 +20,6 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	vmv1beta1 "github.com/VictoriaMetrics/operator/api/operator/v1beta1"
 	"github.com/VictoriaMetrics/operator/internal/manager"
 )
 
@@ -249,60 +249,11 @@ func startNewOperator(ctx context.Context) (context.CancelFunc, chan struct{}) {
 func cleanupNamespace(ctx context.Context, k8sClient client.Client, watchNamespace string) {
 	GinkgoHelper()
 
-	// Clear finalizers from VMAgent objects to ensure namespace doesn't block
-	var agents vmv1beta1.VMAgentList
-	if err := k8sClient.List(ctx, &agents, client.InNamespace(watchNamespace)); err == nil {
-		for i := range agents.Items {
-			agent := &agents.Items[i]
-			agent.Finalizers = nil
-			_ = k8sClient.Update(ctx, agent)
-			_ = k8sClient.Delete(ctx, agent)
-		}
-	}
-
-	// Clear finalizers from VMSingle objects
-	var singles vmv1beta1.VMSingleList
-	if err := k8sClient.List(ctx, &singles, client.InNamespace(watchNamespace)); err == nil {
-		for i := range singles.Items {
-			single := &singles.Items[i]
-			single.Finalizers = nil
-			_ = k8sClient.Update(ctx, single)
-			_ = k8sClient.Delete(ctx, single)
-		}
-	}
-
-	// Clear finalizers from VMCluster objects
-	var clusters vmv1beta1.VMClusterList
-	if err := k8sClient.List(ctx, &clusters, client.InNamespace(watchNamespace)); err == nil {
-		for i := range clusters.Items {
-			cluster := &clusters.Items[i]
-			cluster.Finalizers = nil
-			_ = k8sClient.Update(ctx, cluster)
-			_ = k8sClient.Delete(ctx, cluster)
-		}
-	}
-
-	// Clear finalizers from Roles
-	var roles rbacv1.RoleList
-	if err := k8sClient.List(ctx, &roles, client.InNamespace(watchNamespace)); err == nil {
-		for i := range roles.Items {
-			role := &roles.Items[i]
-			role.Finalizers = nil
-			_ = k8sClient.Update(ctx, role)
-			_ = k8sClient.Delete(ctx, role)
-		}
-	}
-
-	// Clear finalizers from RoleBindings
-	var roleBindings rbacv1.RoleBindingList
-	if err := k8sClient.List(ctx, &roleBindings, client.InNamespace(watchNamespace)); err == nil {
-		for i := range roleBindings.Items {
-			rb := &roleBindings.Items[i]
-			rb.Finalizers = nil
-			_ = k8sClient.Update(ctx, rb)
-			_ = k8sClient.Delete(ctx, rb)
-		}
-	}
+	// Clear finalizers from all namespaced objects using kubectl.
+	exec.Command("sh", "-c", fmt.Sprintf(
+		"kubectl get $(kubectl api-resources --namespaced=true --verbs=list -o name | tr \"\n\" \",\" | sed -e 's/,$//') -n %s -o name | xargs -I {} kubectl patch {} -n %s -p '{\"metadata\":{\"finalizers\":[]}}' --type=merge",
+		watchNamespace, watchNamespace,
+	)).Run()
 
 	// Delete namespace
 	nsObj := &corev1.Namespace{