e2e storage test: intree driver adds the support for nfs v3

Author: carlory

test/e2e/storage/drivers/in_tree.go

@@ -69,11 +69,20 @@ const (
 	iSCSIIQNTemplate = "iqn.2003-01.io.k8s:e2e.%s"
 )
 
+type NFSProtocalVersion string
+
+const (
+	NFSv3 NFSProtocalVersion = "3"
+	NFSv4 NFSProtocalVersion = "4"
+)
+
 // NFS
 type nfsDriver struct {
 	externalProvisionerPod *v1.Pod
 	externalPluginName     string
 
+	// path that is exported by the NFS server.
+	path       string
 	driverInfo storageframework.DriverInfo
 }
 
@@ -90,28 +99,43 @@ var _ storageframework.PreprovisionedPVTestDriver = &nfsDriver{}
 var _ storageframework.DynamicPVTestDriver = &nfsDriver{}
 
 // InitNFSDriver returns nfsDriver that implements TestDriver interface
-func InitNFSDriver() storageframework.TestDriver {
-	return &nfsDriver{
-		driverInfo: storageframework.DriverInfo{
-			Name:             "nfs",
-			InTreePluginName: "kubernetes.io/nfs",
-			MaxFileSize:      storageframework.FileSizeLarge,
-			SupportedSizeRange: e2evolume.SizeRange{
-				Min: "1Gi",
-			},
-			SupportedFsType: sets.NewString(
-				"", // Default fsType
-			),
-			SupportedMountOption: sets.NewString("relatime"),
-			RequiredMountOption:  sets.NewString("vers=4.0"),
-			Capabilities: map[storageframework.Capability]bool{
-				storageframework.CapPersistence:       true,
-				storageframework.CapExec:              true,
-				storageframework.CapRWX:               true,
-				storageframework.CapMultiPODs:         true,
-				storageframework.CapMultiplePVsSameID: true,
+func InitNFSDriver(version NFSProtocalVersion) func() storageframework.TestDriver {
+	var driverName, path, mountOption string
+	switch version {
+	case NFSv3:
+		driverName = "nfs3"
+		path = "/exports"
+		mountOption = "vers=3"
+	case NFSv4:
+		driverName = "nfs"
+		path = "/"
+		mountOption = "vers=4.0"
+	}
+
+	return func() storageframework.TestDriver {
+		return &nfsDriver{
+			path: path,
+			driverInfo: storageframework.DriverInfo{
+				Name:             driverName,
+				InTreePluginName: "kubernetes.io/nfs",
+				MaxFileSize:      storageframework.FileSizeLarge,
+				SupportedSizeRange: e2evolume.SizeRange{
+					Min: "1Gi",
+				},
+				SupportedFsType: sets.NewString(
+					"", // Default fsType
+				),
+				SupportedMountOption: sets.NewString("relatime"),
+				RequiredMountOption:  sets.NewString(mountOption),
+				Capabilities: map[storageframework.Capability]bool{
+					storageframework.CapPersistence:       true,
+					storageframework.CapExec:              true,
+					storageframework.CapRWX:               true,
+					storageframework.CapMultiPODs:         true,
+					storageframework.CapMultiplePVsSameID: true,
+				},
 			},
-		},
+		}
 	}
 }
 
@@ -130,7 +154,7 @@ func (n *nfsDriver) GetVolumeSource(readOnly bool, fsType string, e2evolume stor
 	return &v1.VolumeSource{
 		NFS: &v1.NFSVolumeSource{
 			Server:   nv.serverHost,
-			Path:     "/",
+			Path:     n.path,
 			ReadOnly: readOnly,
 		},
 	}
@@ -144,15 +168,16 @@ func (n *nfsDriver) GetPersistentVolumeSource(readOnly bool, fsType string, e2ev
 	return &v1.PersistentVolumeSource{
 		NFS: &v1.NFSVolumeSource{
 			Server:   nv.serverHost,
-			Path:     "/",
+			Path:     n.path,
 			ReadOnly: readOnly,
 		},
 	}, nil
 }
 
 func (n *nfsDriver) GetDynamicProvisionStorageClass(ctx context.Context, config *storageframework.PerTestConfig, fsType string) *storagev1.StorageClass {
 	provisioner := n.externalPluginName
-	parameters := map[string]string{"mountOptions": "vers=4.0"}
+	mountOptions := strings.Join(n.driverInfo.RequiredMountOption.List(), ",")
+	parameters := map[string]string{"mountOptions": mountOptions}
 	ns := config.Framework.Namespace.Name
 
 	return storageframework.GetStorageClass(provisioner, parameters, nil, ns)

test/e2e/storage/in_tree_volumes.go

@@ -28,7 +28,8 @@ import (
 
 // List of testDrivers to be executed in below loop
 var testDrivers = []func() storageframework.TestDriver{
-	drivers.InitNFSDriver,
+	drivers.InitNFSDriver(drivers.NFSv3),
+	drivers.InitNFSDriver(drivers.NFSv4),
 	drivers.InitISCSIDriver,
 	drivers.InitHostPathDriver,
 	drivers.InitHostPathSymlinkDriver,