e2e: add VolumeAttributesClass test for NFS

Signed-off-by: Niels de Vos <ndevos@ibm.com>

Author: nixpanic

e2e/nfs.go

@@ -227,6 +227,51 @@ func createNFSStorageClass(
 	})
 }
 
+func createNFSVolumeAttributesClass(
+	c clientset.Interface,
+	f *framework.Framework,
+	enablePool bool,
+	params map[string]string,
+) error {
+	vacPath := fmt.Sprintf("%s/%s", nfsExamplePath, "vac-relocated.yaml")
+	vac, err := getVolumeAttributesClass(vacPath)
+	if err != nil {
+		return err
+	}
+	vac.Parameters["server"] = "rook-ceph-nfs-my-nfs-a." + rookNamespace + ".svc.cluster.local"
+
+	// overload any parameters that were passed
+	if params == nil {
+		// create an empty params, so that params["clusterID"] below
+		// does not panic
+		params = map[string]string{}
+	}
+	for param, value := range params {
+		vac.Parameters[param] = value
+	}
+
+	vac.DriverName = nfsDriverName
+
+	timeout := time.Duration(deployTimeout) * time.Minute
+
+	return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(ctx context.Context) (bool, error) {
+		_, err = c.StorageV1().VolumeAttributesClasses().Create(ctx, &vac, metav1.CreateOptions{})
+		if err != nil {
+			framework.Logf("error creating VolumeAttributesClass %q: %v", vac.Name, err)
+			if apierrs.IsAlreadyExists(err) {
+				return true, nil
+			}
+			if isRetryableAPIError(err) {
+				return false, nil
+			}
+
+			return false, fmt.Errorf("failed to create VolumeAttributesClass %q: %w", vac.Name, err)
+		}
+
+		return true, nil
+	})
+}
+
 // unmountNFSVolume unmounts a NFS volume mounted on a pod.
 func unmountNFSVolume(f *framework.Framework, appName, pvcName string) error {
 	pod, err := f.ClientSet.CoreV1().Pods(f.UniqueName).Get(context.TODO(), appName, metav1.GetOptions{})
@@ -500,6 +545,46 @@ var _ = Describe("nfs", func() {
 				}
 			})
 
+			By("create a storageclass with relocated server and a PVC then bind it to an app", func() {
+				if !k8sVersionGreaterEquals(c, 1, 34) {
+					framework.Logf("skipping VolumeAttributesClass test, needs Kubernetes >= 1.34")
+
+					return
+				}
+
+				err := createNFSStorageClass(f.ClientSet, f, false, map[string]string{
+					"server": "relocated.example.net", // mounting will fail without vac
+				})
+				if err != nil {
+					logAndFail("failed to create NFS storageclass: %v", err)
+				}
+				err = createNFSVolumeAttributesClass(f.ClientSet, f, false, nil)
+				if err != nil {
+					logAndFail("failed to create NFS voluemattributesclass: %v", err)
+				}
+
+				pvc, err := loadPVC(pvcPath)
+				if err != nil {
+					logAndFail("Could not create PVC: 1 %v", err)
+				}
+				pvc.Namespace = f.UniqueName
+				vacName := "relocated-server"
+				pvc.Spec.VolumeAttributesClassName = &vacName
+				err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
+				if err != nil {
+					logAndFail("failed to create PVC: %v", err)
+				}
+
+				err = deleteResource(nfsExamplePath + "storageclass.yaml")
+				if err != nil {
+					logAndFail("failed to delete NFS storageclass: %v", err)
+				}
+				err = deleteResource(nfsExamplePath + "vac-relocated.yaml")
+				if err != nil {
+					logAndFail("failed to delete NFS storageclass: %v", err)
+				}
+			})
+
 			By("create a storageclass with sys,krb5i security and a PVC then bind it to an app", func() {
 				err := createNFSStorageClass(f.ClientSet, f, false, map[string]string{
 					"secTypes": "sys,krb5i",

e2e/utils.go

@@ -368,6 +368,13 @@ func getStorageClass(path string) (scv1.StorageClass, error) {
 	return sc, err
 }
 
+func getVolumeAttributesClass(path string) (scv1.VolumeAttributesClass, error) {
+	vac := scv1.VolumeAttributesClass{}
+	err := unmarshal(path, &vac)
+
+	return vac, err
+}
+
 func getSecret(path string) (v1.Secret, error) {
 	sc := v1.Secret{}
 	err := unmarshal(path, &sc)

examples/nfs/vac-relocated.yaml

@@ -0,0 +1,9 @@
+---
+# apiVersion: storage.k8s.io/v1beta1 for k8s version 1.33
+apiVersion: storage.k8s.io/v1
+kind: VolumeAttributesClass
+metadata:
+  name: relocated-server
+driverName: nfs.csi.ceph.com
+parameters:
+  server: to-be-deployed.example.net