From d46a054fe73e7717037bf51272e0ec1f8da82f76 Mon Sep 17 00:00:00 2001
From: Michael Shitrit <mshitrit@redhat.com>
Date: Thu, 18 Jan 2024 11:55:56 +0200
Subject: [PATCH] As snr no longer deals with VAs remove VA logic from test

Signed-off-by: Michael Shitrit <mshitrit@redhat.com>
---
 .../selfnoderemediation_controller_test.go    | 58 -------------------
 1 file changed, 58 deletions(-)

diff --git a/controllers/tests/controller/selfnoderemediation_controller_test.go b/controllers/tests/controller/selfnoderemediation_controller_test.go
index 6d7444b14..f6c745abe 100644
--- a/controllers/tests/controller/selfnoderemediation_controller_test.go
+++ b/controllers/tests/controller/selfnoderemediation_controller_test.go
@@ -10,7 +10,6 @@ import (
 	. "github.com/onsi/gomega"
 
 	v1 "k8s.io/api/core/v1"
-	storagev1 "k8s.io/api/storage/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -35,7 +34,6 @@ const (
 var _ = Describe("SNR Controller", func() {
 	var snr *v1alpha1.SelfNodeRemediation
 	var remediationStrategy v1alpha1.RemediationStrategyType
-	var vaName = "some-va"
 	var nodeRebootCapable = "true"
 	var isAdditionalSetupNeeded = false
 
@@ -49,9 +47,6 @@ var _ = Describe("SNR Controller", func() {
 
 	JustBeforeEach(func() {
 		if isAdditionalSetupNeeded {
-			createVolumeAttachment(vaName)
-			verifyVaNotDeleted(vaName)
-
 			createSelfNodeRemediationPod()
 			verifySelfNodeRemediationPodExist()
 		}
@@ -66,7 +61,6 @@ var _ = Describe("SNR Controller", func() {
 		isAdditionalSetupNeeded = false
 		deleteRemediations()
 		deleteSelfNodeRemediationPod()
-		deleteVolumeAttachment(vaName, false)
 		//clear node's state, this is important to remove taints, label etc.
 		Expect(k8sClient.Update(context.Background(), getNode(shared.UnhealthyNodeName)))
 		Expect(k8sClient.Update(context.Background(), getNode(shared.PeerNodeName)))
@@ -235,8 +229,6 @@ var _ = Describe("SNR Controller", func() {
 
 				verifyNoWatchdogFood()
 
-				verifyVaNotDeleted(vaName)
-
 				// The kube-api calls for VA fail intentionally. In this case, we expect the snr agent to try
 				// to delete node resources again. So LastError is set to the error every time Reconcile()
 				// is triggered. If it becomes another error, it means something unintended happens.
@@ -246,8 +238,6 @@ var _ = Describe("SNR Controller", func() {
 
 				verifySelfNodeRemediationPodDoesntExist()
 
-				deleteVolumeAttachment(vaName, true)
-
 				deleteSNR(snr)
 
 				removeUnschedulableTaint()
@@ -322,8 +312,6 @@ var _ = Describe("SNR Controller", func() {
 				// simulate the out-of-service taint by Pod GC Controller
 				deleteTerminatingPod()
 
-				deleteVolumeAttachment(vaName, true)
-
 				verifyOutOfServiceTaintRemoved()
 
 				verifyEvent("Normal", "RemoveOutOfService", "Remediation process - remove out-of-service taint from node")
@@ -456,23 +444,6 @@ var _ = Describe("SNR Controller", func() {
 	})
 })
 
-func createVolumeAttachment(vaName string) {
-	va := &storagev1.VolumeAttachment{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      vaName,
-			Namespace: shared.Namespace,
-		},
-		Spec: storagev1.VolumeAttachmentSpec{
-			Attacher: "foo",
-			Source:   storagev1.VolumeAttachmentSource{},
-			NodeName: shared.UnhealthyNodeName,
-		},
-	}
-	foo := "foo"
-	va.Spec.Source.PersistentVolumeName = &foo
-	ExpectWithOffset(1, k8sClient.Create(context.Background(), va)).To(Succeed())
-}
-
 func verifyTypeConditions(nodeName string, expectedProcessingConditionStatus, expectedSucceededConditionStatus metav1.ConditionStatus, expectedReason string) {
 	By("Verify that SNR Processing status condition is correct")
 	snr := &v1alpha1.SelfNodeRemediation{}
@@ -491,35 +462,6 @@ func verifyTypeConditions(nodeName string, expectedProcessingConditionStatus, ex
 	}, 5*time.Second, 250*time.Millisecond).Should(BeTrue())
 }
 
-func deleteVolumeAttachment(vaName string, verifyExist bool) {
-	va := &storagev1.VolumeAttachment{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      vaName,
-			Namespace: shared.Namespace,
-		},
-	}
-
-	err := k8sClient.Delete(context.Background(), va)
-	if !verifyExist && apierrors.IsNotFound(err) {
-		return
-	}
-	ExpectWithOffset(1, err).To(Succeed())
-}
-
-func verifyVaNotDeleted(vaName string) {
-	vaKey := client.ObjectKey{
-		Namespace: shared.Namespace,
-		Name:      vaName,
-	}
-
-	ConsistentlyWithOffset(1, func() bool {
-		va := &storagev1.VolumeAttachment{}
-		err := k8sClient.Get(context.Background(), vaKey, va)
-		return apierrors.IsNotFound(err)
-
-	}, 5*time.Second, 250*time.Millisecond).Should(BeFalse())
-}
-
 func verifyLastErrorKeepsApiError() {
 	By("Verify that LastError in SNR status has been kept")
 	snr := &v1alpha1.SelfNodeRemediation{}