Remove PVC node selection E2E test case.

According to #7904, remove the corresponding E2E case.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>

test/e2e/basic/pvc-selected-node-changing.go

@@ -1,174 +0,0 @@
-package basic
-
-import (
-	"context"
-	"fmt"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
-	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
-	. "github.com/vmware-tanzu/velero/test"
-	. "github.com/vmware-tanzu/velero/test/e2e/test"
-	"github.com/vmware-tanzu/velero/test/util/common"
-	. "github.com/vmware-tanzu/velero/test/util/k8s"
-	. "github.com/vmware-tanzu/velero/test/util/velero"
-)
-
-type PVCSelectedNodeChanging struct {
-	TestCase
-	labels         map[string]string
-	data           map[string]string
-	configmaptName string
-	namespace      string
-	oldNodeName    string
-	newNodeName    string
-	volume         string
-	podName        string
-	mappedNS       string
-	pvcName        string
-	ann            string
-}
-
-var PVCSelectedNodeChangingTest func() = TestFunc(&PVCSelectedNodeChanging{})
-
-func (p *PVCSelectedNodeChanging) Init() error {
-	p.TestCase.Init()
-	p.CaseBaseName = "psnc-" + p.UUIDgen
-	p.namespace = p.CaseBaseName
-	p.mappedNS = p.namespace + "-mapped"
-	p.TestMsg = &TestMSG{
-		Desc:      "Changing PVC node selector",
-		FailedMSG: "Failed to changing PVC node selector",
-		Text:      "Change node selectors of persistent volume claims during restores",
-	}
-	p.BackupName = "backup-" + p.CaseBaseName
-	p.RestoreName = "restore-" + p.CaseBaseName
-	p.labels = map[string]string{"velero.io/plugin-config": "",
-		"velero.io/change-pvc-node-selector": "RestoreItemAction"}
-	p.configmaptName = "change-pvc-node-selector-config"
-	p.volume = "volume-1"
-	p.podName = "pod-1"
-	p.pvcName = "pvc-1"
-	p.ann = "volume.kubernetes.io/selected-node"
-	p.BackupArgs = []string{
-		"create", "--namespace", p.VeleroCfg.VeleroNamespace, "backup", p.BackupName,
-		"--include-namespaces", p.namespace,
-		"--snapshot-volumes=false", "--wait",
-	}
-	p.RestoreArgs = []string{
-		"create", "--namespace", p.VeleroCfg.VeleroNamespace, "restore", p.RestoreName,
-		"--from-backup", p.BackupName, "--namespace-mappings", fmt.Sprintf("%s:%s", p.namespace, p.mappedNS), "--wait",
-	}
-	return nil
-}
-
-func (p *PVCSelectedNodeChanging) CreateResources() error {
-	By(fmt.Sprintf("Create namespace %s", p.namespace), func() {
-		labels := make(map[string]string)
-		if p.VeleroCfg.WorkerOS == common.WorkerOSWindows {
-			labels = map[string]string{
-				"pod-security.kubernetes.io/enforce":         "privileged",
-				"pod-security.kubernetes.io/enforce-version": "latest",
-			}
-		}
-		Expect(CreateNamespaceWithLabel(p.Ctx, p.Client, p.namespace, labels)).To(Succeed(),
-			fmt.Sprintf("Failed to create namespace %s", p.namespace))
-	})
-
-	By(fmt.Sprintf("Create pod %s in namespace %s", p.podName, p.namespace), func() {
-		nodeNameList, err := GetWorkerNodes(p.Ctx, p.VeleroCfg.WorkerOS)
-		Expect(err).To(Succeed())
-		for _, nodeName := range nodeNameList {
-			p.oldNodeName = nodeName
-			fmt.Printf("Create PVC on node %s\n", p.oldNodeName)
-			pvcAnn := map[string]string{p.ann: nodeName}
-			_, err := CreatePod(
-				p.Client,
-				p.namespace,
-				p.podName,
-				StorageClassName,
-				p.pvcName,
-				[]string{p.volume},
-				pvcAnn,
-				nil,
-				p.VeleroCfg.ImageRegistryProxy,
-				p.VeleroCfg.WorkerOS,
-			)
-			Expect(err).To(Succeed())
-			err = WaitForPods(p.Ctx, p.Client, p.namespace, []string{p.podName})
-			Expect(err).To(Succeed())
-			break
-		}
-	})
-
-	By("Prepare ConfigMap data", func() {
-		nodeNameList, err := GetWorkerNodes(p.Ctx, p.VeleroCfg.WorkerOS)
-		Expect(err).To(Succeed())
-		// Expect Windows node or Linux node number are no less than 2.
-		Expect(len(nodeNameList)).To(BeNumerically(">=", 2))
-		for _, nodeName := range nodeNameList {
-			if nodeName != p.oldNodeName {
-				p.newNodeName = nodeName
-				break
-			}
-		}
-		p.data = map[string]string{p.oldNodeName: p.newNodeName}
-	})
-
-	By(fmt.Sprintf("Create ConfigMap %s in namespace %s", p.configmaptName, p.VeleroCfg.VeleroNamespace), func() {
-		cm, err := CreateConfigMap(p.Client.ClientGo, p.VeleroCfg.VeleroNamespace, p.configmaptName, p.labels, p.data)
-		Expect(err).To(Succeed(), fmt.Sprintf("failed to create configmap in the namespace %q", p.VeleroCfg.VeleroNamespace))
-		fmt.Printf("Configmap: %v", cm)
-	})
-	return nil
-}
-
-func (p *PVCSelectedNodeChanging) Destroy() error {
-	By(fmt.Sprintf("Start to destroy namespace %s......", p.CaseBaseName), func() {
-		Expect(CleanupNamespacesWithPoll(p.Ctx, p.Client, p.CaseBaseName)).To(Succeed(),
-			fmt.Sprintf("Failed to delete namespace %s", p.CaseBaseName))
-	})
-	return nil
-}
-
-func (p *PVCSelectedNodeChanging) Restore() error {
-	By(fmt.Sprintf("Start to restore %s .....", p.RestoreName), func() {
-		Expect(VeleroRestoreExec(p.Ctx, p.VeleroCfg.VeleroCLI,
-			p.VeleroCfg.VeleroNamespace, p.RestoreName,
-			p.RestoreArgs, velerov1api.RestorePhaseCompleted)).To(
-			Succeed(),
-			func() string {
-				RunDebug(context.Background(), p.VeleroCfg.VeleroCLI,
-					p.VeleroCfg.VeleroNamespace, "", p.RestoreName)
-				return "Fail to restore workload"
-			})
-		err := WaitForPods(p.Ctx, p.Client, p.mappedNS, []string{p.podName})
-		Expect(err).To(Succeed())
-	})
-	return nil
-}
-func (p *PVCSelectedNodeChanging) Verify() error {
-	By(fmt.Sprintf("PVC selected node should be %s", p.newNodeName), func() {
-		pvcNameList, err := GetPvcByPVCName(p.Ctx, p.mappedNS, p.pvcName)
-		Expect(err).To(Succeed())
-		Expect(pvcNameList).Should(HaveLen(1))
-		pvc, err := GetPVC(p.Ctx, p.Client, p.mappedNS, pvcNameList[0])
-		Expect(err).To(Succeed())
-		Expect(pvc.Annotations[p.ann]).To(Equal(p.newNodeName))
-	})
-	return nil
-}
-
-func (p *PVCSelectedNodeChanging) Clean() error {
-	if CurrentSpecReport().Failed() && p.VeleroCfg.FailFast {
-		fmt.Println("Test case failed and fail fast is enabled. Skip resource clean up.")
-	} else {
-		p.TestCase.Clean()
-		By(fmt.Sprintf("Clean namespace with prefix %s after test", p.mappedNS), func() {
-			CleanupNamespaces(p.Ctx, p.Client, p.mappedNS)
-		})
-	}
-
-	return nil
-}

test/e2e/e2e_suite_test.go

@@ -440,12 +440,6 @@ var _ = Describe(
 	StorageClasssChangingTest,
 )
 
-var _ = Describe(
-	"Node selectors of persistent volume claims can be changed during restores",
-	Label("Basic", "SelectedNode", "SKIP_KIND"),
-	PVCSelectedNodeChangingTest,
-)
-
 var _ = Describe(
 	"Backup/restore of 2500 namespaces",
 	Label("Scale", "LongTime"),