add support for powerscale 2.2.0

api/v1alpha1/types.go

@@ -129,6 +129,10 @@ type Driver struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CSI Driver Type"
 	CSIDriverType DriverType `json:"csiDriverType" yaml:"csiDriverType"`
 
+	// CSIDriverSpec is the specification for CSIDriver
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CSI Driver Spec"
+	CSIDriverSpec CSIDriverSpec `json:"csiDriverSpec" yaml:"csiDriverSpec"`
+
 	// ConfigVersion is the configuration version of the driver
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Config Version"
 	ConfigVersion string `json:"configVersion" yaml:"configVersion"`
@@ -230,3 +234,8 @@ type SnapshotClass struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Snapshot Class Parameters"
 	Parameters map[string]string `json:"parameters,omitempty" yaml:"parameters"`
 }
+
+//CSIDriverSpec struct
+type CSIDriverSpec struct {
+	FSGroupPolicy string `json:"fSGroupPolicy,omitempty" yaml:"fSGroupPolicy,omitempty"`
+}

config/crd/bases/storage.dell.com_containerstoragemodules.yaml

@@ -438,6 +438,12 @@ spec:
                           type: object
                         type: array
                     type: object
+                  csiDriverSpec:
+                    description: CSIDriverSpec is the specification for CSIDriver
+                    properties:
+                      fSGroupPolicy:
+                        type: string
+                    type: object
                   csiDriverType:
                     description: CSIDriverType is the CSI Driver type for Dell EMC
                       - e.g, powermax, powerflex,...

config/manager/kustomization.yaml

@@ -10,3 +10,7 @@ configMapGenerator:
   name: manager-config
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+images:
+- name: controller
+  newName: dellemc/dell-csm-operator
+  newTag: 0.1.0

controllers/csm_controller.go

@@ -680,12 +680,10 @@ func (r *ContainerStorageModuleReconciler) PreChecks(ctx context.Context, cr *cs
 	if cr.Spec.Driver.Common.Image == "" {
 		return fmt.Errorf("driver image not specified in spec")
 	}
-	if cr.Spec.Driver.ConfigVersion == "" || cr.Spec.Driver.ConfigVersion != "v2.1.0" {
+	if cr.Spec.Driver.ConfigVersion == "" || cr.Spec.Driver.ConfigVersion != "v2.2.0" {
 		return fmt.Errorf("driver version not specified in spec or driver version is not valid")
 	}
 
-	// add check for version
-
 	// Check drivers
 	switch cr.Spec.Driver.CSIDriverType {
 	case csmv1.PowerScale:

deploy/operator.yaml

@@ -1,4 +1,11 @@
 apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: dell-csm-operator
+---
+apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:

operatorconfig/driverconfig/powerscale/v2.1.0/csidriver.yaml → operatorconfig/driverconfig/powerscale/v2.2.0/csidriver.yaml

@@ -5,6 +5,7 @@ metadata:
 spec:
     attachRequired: true
     podInfoOnMount: true
+    fsGroupPolicy: ReadWriteOnceWithFSType
     volumeLifecycleModes:
     - Persistent
-    - Ephemeral
+    - Ephemeral

pkg/drivers/commonconfig.go

@@ -254,5 +254,16 @@ func GetCSIDriver(ctx context.Context, cr csmv1.ContainerStorageModule, operator
 		return nil, err
 	}
 
+	if cr.Spec.Driver.CSIDriverSpec.FSGroupPolicy != "" {
+		fsGroupPolicy := storagev1.NoneFSGroupPolicy
+		if cr.Spec.Driver.CSIDriverSpec.FSGroupPolicy == "ReadWriteOnceWithFSType" {
+			fsGroupPolicy = storagev1.ReadWriteOnceWithFSTypeFSGroupPolicy
+		} else if cr.Spec.Driver.CSIDriverSpec.FSGroupPolicy == "File" {
+			fsGroupPolicy = storagev1.FileFSGroupPolicy
+		}
+		csidriver.Spec.FSGroupPolicy = &fsGroupPolicy
+		log.Debugw("GetCSIDriver", "fsGroupPolicy", fsGroupPolicy)
+	}
+
 	return &csidriver, nil
 }

samples/storage_csm_powerscale.yaml

@@ -6,17 +6,22 @@ metadata:
 spec:
   driver:
     csiDriverType: "isilon" 
+    csiDriverSpec:
+      # fsGroupPolicy: Defines if the underlying volume supports changing ownership and permission of the volume before being mounted.
+      # Allowed values: ReadWriteOnceWithFSType, File , None
+      # Default value: ReadWriteOnceWithFSType
+      fSGroupPolicy: "ReadWriteOnceWithFSType"
     # Config version for CSI PowerScale v2.1.0 driver
-    configVersion: v2.1.0
+    configVersion: v2.2.0
     authSecret: test-isilon-creds
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     # Uninstall CSI Driver and/or modules when CR is deleted
     forceRemoveDriver: false
     common:
-      # Image for CSI PowerScale driver v2.1.0
-      image: "dellemc/csi-isilon:v2.1.0"
+      # Image for CSI PowerScale driver v2.2.0
+      image: "dellemc/csi-isilon:nightly"
       imagePullPolicy: IfNotPresent
       envs:
         # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs