Merge pull request #15 from RomanBednar/cherry-fstype-param

Bug 2080449: UPSTREAM: 1023: add new option to allow VHD feature opt-out
openshift · Jun 15, 2022 · 67c3831 · 67c3831
2 parents 57adb71 + b3645b3
commit 67c3831
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/pkg/azurefile/azurefile.go b/pkg/azurefile/azurefile.go
@@ -174,6 +174,7 @@ type DriverOptions struct {
 	UserAgentSuffix                        string
 	AllowEmptyCloudConfig                  bool
 	AllowInlineVolumeKeyAccessWithIdentity bool
+	EnableVHDDiskFeature                   bool
 	EnableGetVolumeStats                   bool
 	MountPermissions                       uint64
 }
@@ -188,6 +189,7 @@ type Driver struct {
 	userAgentSuffix                        string
 	allowEmptyCloudConfig                  bool
 	allowInlineVolumeKeyAccessWithIdentity bool
+	enableVHDDiskFeature                   bool
 	enableGetVolumeStats                   bool
 	mountPermissions                       uint64
 	fileClient                             *azureFileClient
@@ -226,6 +228,7 @@ func NewDriver(options *DriverOptions) *Driver {
 	driver.userAgentSuffix = options.UserAgentSuffix
 	driver.allowEmptyCloudConfig = options.AllowEmptyCloudConfig
 	driver.allowInlineVolumeKeyAccessWithIdentity = options.AllowInlineVolumeKeyAccessWithIdentity
+	driver.enableVHDDiskFeature = options.EnableVHDDiskFeature
 	driver.enableGetVolumeStats = options.EnableGetVolumeStats
 	driver.mountPermissions = options.MountPermissions
 	driver.volLockMap = newLockMap()

diff --git a/pkg/azurefile/azurefile_test.go b/pkg/azurefile/azurefile_test.go
@@ -59,6 +59,14 @@ func NewFakeDriver() *Driver {
 	return driver
 }
 
+func NewFakeDriverCustomOptions(opts DriverOptions) *Driver {
+	driverOptions := opts
+	driver := NewDriver(&driverOptions)
+	driver.Name = fakeDriverName
+	driver.Version = vendorVersion
+	return driver
+}
+
 func TestNewFakeDriver(t *testing.T) {
 	driverOptions := DriverOptions{
 		NodeID:     fakeNodeID,

diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -220,6 +220,10 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		}
 	}
 
+	if !d.enableVHDDiskFeature && fsType != "" {
+		return nil, status.Errorf(codes.InvalidArgument, "fsType storage class parameter enables experimental VDH disk feature which is currently disabled, use --enable-vhd driver option to enable it")
+	}
+
 	if !isSupportedFsType(fsType) {
 		return nil, status.Errorf(codes.InvalidArgument, "fsType(%s) is not supported, supported fsType list: %v", fsType, supportedFsTypeList)
 	}

diff --git a/pkg/azurefile/controllerserver_test.go b/pkg/azurefile/controllerserver_test.go
@@ -231,7 +231,13 @@ func TestCreateVolume(t *testing.T) {
 				}
 
 				ctx := context.Background()
-				d := NewFakeDriver()
+
+				driverOptions := DriverOptions{
+					NodeID:               fakeNodeID,
+					DriverName:           DefaultDriverName,
+					EnableVHDDiskFeature: true,
+				}
+				d := NewFakeDriverCustomOptions(driverOptions)
 
 				d.AddControllerServiceCapabilities(
 					[]csi.ControllerServiceCapability_RPC_Type{
@@ -308,7 +314,13 @@ func TestCreateVolume(t *testing.T) {
 				}
 
 				ctx := context.Background()
-				d := NewFakeDriver()
+
+				driverOptions := DriverOptions{
+					NodeID:               fakeNodeID,
+					DriverName:           DefaultDriverName,
+					EnableVHDDiskFeature: true,
+				}
+				d := NewFakeDriverCustomOptions(driverOptions)
 
 				d.AddControllerServiceCapabilities(
 					[]csi.ControllerServiceCapability_RPC_Type{
@@ -759,7 +771,13 @@ func TestCreateVolume(t *testing.T) {
 					Parameters:         allParam,
 				}
 
-				d := NewFakeDriver()
+				driverOptions := DriverOptions{
+					NodeID:               fakeNodeID,
+					DriverName:           DefaultDriverName,
+					EnableVHDDiskFeature: true,
+				}
+				d := NewFakeDriverCustomOptions(driverOptions)
+
 				d.cloud = &azure.Cloud{}
 				d.cloud.KubeClient = fake.NewSimpleClientset()
 

diff --git a/pkg/azurefileplugin/main.go b/pkg/azurefileplugin/main.go
@@ -50,6 +50,7 @@ var (
 	enableGetVolumeStats                   = flag.Bool("enable-get-volume-stats", true, "allow GET_VOLUME_STATS on agent node")
 	mountPermissions                       = flag.Uint64("mount-permissions", 0777, "mounted folder permissions")
 	allowInlineVolumeKeyAccessWithIdentity = flag.Bool("allow-inline-volume-key-access-with-identity", false, "allow accessing storage account key using cluster identity for inline volume")
+	enableVHDDiskFeature                   = flag.Bool("enable-vhd", true, "enable VHD disk feature (experimental)")
 )
 
 func main() {
@@ -85,6 +86,7 @@ func handle() {
 		EnableGetVolumeStats:                   *enableGetVolumeStats,
 		MountPermissions:                       *mountPermissions,
 		AllowInlineVolumeKeyAccessWithIdentity: *allowInlineVolumeKeyAccessWithIdentity,
+		EnableVHDDiskFeature:                   *enableVHDDiskFeature,
 	}
 	driver := azurefile.NewDriver(&driverOptions)
 	if driver == nil {