add support for powerscale 2.2.0

.github/workflows/actions.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Run unit tests and check package coverage
         uses: dell/common-github-actions/go-code-tester@csm-operator-controllers
         with:
-          threshold: 50
+          threshold: 64 
   test_driver:
     name: Run Go unit tests on driver and check package coverage
     runs-on: ubuntu-latest
@@ -54,7 +54,7 @@ jobs:
       - name: Run unit tests and check package coverage
         uses: dell/common-github-actions/go-code-tester@csm-operator-drivers
         with:
-          threshold: 90
+          threshold: 77
   go_security_scan:
     name: Go security
     runs-on: ubuntu-latest

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"`
+}

bundle/manifests/dell-csm-operator.clusterserviceversion.yaml

@@ -48,10 +48,10 @@ metadata:
                     "value": "debug"
                   }
                 ],
-                "image": "dellemc/csi-isilon:v2.0.0",
+                "image": "dellemc/csi-isilon:v2.x.y",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.0.0",
+              "configVersion": "v2.x.y",
               "controller": {
                 "envs": [
                   {
@@ -112,7 +112,7 @@ metadata:
                     "image": "dellemc/csm-authorization-sidecar:v1.0.0"
                   }
                 ],
-                "configVersion": "v2.0.0",
+                "configVersion": "v2.x.y",
                 "enabled": false,
                 "name": "authorization"
               }

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

@@ -442,6 +442,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/controller.yaml → operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml

@@ -213,7 +213,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: driver
-          image: dellemc/csi-isilon:v2.1.0
+          image: dellemc/csi-isilon:v2.2.0
           imagePullPolicy: IfNotPresent
           command: [ "/csi-isilon" ]
           args:
@@ -285,4 +285,4 @@ spec:
             secretName: <DriverDefaultReleaseName>-creds
         - name: csi-isilon-config-params
           configMap:
-             name: <DriverDefaultReleaseName>-config-params
+             name: <DriverDefaultReleaseName>-config-params

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

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

@@ -77,7 +77,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: dellemc/csi-isilon:v2.1.0
+          image: dellemc/csi-isilon:v2.2.0
           imagePullPolicy: IfNotPresent
           env:
             - name: CSI_ENDPOINT

operatorconfig/moduleconfig/common/version-values.yaml

@@ -3,5 +3,5 @@ powerscale:
   # List of Driver versions and modules that supports the version
   v2.0.0:
       authorization: "v1.0.0"
-  v2.1.0:
+  v2.2.0:
       authorization: "v1.0.0"

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
 }

pkg/modules/testdata/cr_powerscale_auth.yaml

@@ -6,11 +6,11 @@ metadata:
 spec:
   driver:
     csiDriverType: "isilon"
-    configVersion: v2.1.0
+    configVersion: v2.2.0
     authSecret: test-isilon-creds-custom 
     replicas: 1
     common:
-      image: "dellemc/csi-isilon:v2.1.0"
+      image: "dellemc/csi-isilon:v2.2.0"
       imagePullPolicy: IfNotPresent
 
   modules:

pkg/utils/status.go

@@ -121,7 +121,7 @@ func getDaemonSetStatus(ctx context.Context, instance *csmv1.ContainerStorageMod
 			failedCount++
 			for _, cs := range pod.Status.ContainerStatuses {
 				if cs.State.Waiting != nil && cs.State.Waiting.Reason != constants.ContainerCreating {
-					//message: Back-off pulling image "dellec/csi-isilon:v2.1.0"
+					//message: Back-off pulling image "dellec/csi-isilon:xxxx"
 					//reason: ImagePullBackOff
 					log.Infow("daemonset pod container", "message", cs.State.Waiting.Message, constants.Reason, cs.State.Waiting.Reason)
 					shortMsg := strings.Replace(cs.State.Waiting.Message,

samples/storage_csm_powerscale.yaml

@@ -6,17 +6,22 @@ metadata:
 spec:
   driver:
     csiDriverType: "isilon" 
-    # Config version for CSI PowerScale v2.1.0 driver
-    configVersion: v2.1.0
+    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.2.0 driver
+    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

tests/README.md

@@ -1,7 +1,7 @@
 # Test for CSM Operator
 This is the test directory for CSM operator. 
 
-`config` directory includes yaml files consumed by test cases. For example `driverconfig/powerscale/v2.1.0/node.yaml` is consumed by `pkg/drivers/commonconfig_test.go`.
+`config` directory includes yaml files consumed by test cases. For example `driverconfig/powerscale/v2.x.y/node.yaml` is consumed by `pkg/drivers/commonconfig_test.go`.
 
 `shared/clientgoclient` implements kubernetes client from client-go package. It has a getter function for each API version like `AppsV1Interface` or `CoreV1Interface`. `AppsV1Interface` is the one that we need as it has getter function for `daemonsetInterface`. The `daemonsetInterface` has all `Create`, `Apply`, `Delete` etc. methods that we will be using to manipulate Kubernetes runtime objects.
 

tests/config/driverconfig/powerscale/v2.1.0/node.yaml → tests/config/driverconfig/powerscale/v2.2.0/node.yaml

@@ -77,7 +77,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: dellemc/csi-isilon:v2.1.0
+          image: dellemc/csi-isilon:v2.2.0
           imagePullPolicy: IfNotPresent
           env:
             - name: CSI_ENDPOINT

tests/e2e/testfiles/storage_csm_powerscale.yaml

@@ -7,16 +7,16 @@ spec:
   driver:
     csiDriverType: "isilon"
 
-    # Config version for CSI PowerScale v2.1.0 driver
-    configVersion: v2.1.0
+    # Config version for CSI PowerScale v2.2.0 driver
+    configVersion: v2.2.0
 
     authSecret: test-isilon-creds
 
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     common:
-      # Image for CSI PowerScale driver v2.1.0
+      # Image for CSI PowerScale driver v2.2.0
       image: "dellemc/csi-isilon:nightly"
       imagePullPolicy: IfNotPresent
       envs:

tests/e2e/testfiles/storage_csm_powerscale_auth.yaml

@@ -7,16 +7,16 @@ spec:
   driver:
     csiDriverType: "isilon"
 
-    # Config version for CSI PowerScale v2.1.0 driver
-    configVersion: v2.1.0
+    # Config version for CSI PowerScale v2.2.0 driver
+    configVersion: v2.2.0
 
     authSecret: test-isilon-creds-auth
 
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     common:
-      # Image for CSI PowerScale driver v2.1.0
+      # Image for CSI PowerScale driver v2.2.0
       image: "dellemc/csi-isilon:nightly"
       imagePullPolicy: IfNotPresent
       envs:

tests/shared/common.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	// ConfigVersion - used in all unit test
-	ConfigVersion string = "v2.1.0"
+	ConfigVersion string = "v2.2.0"
 )
 
 // StorageKey is used to store a runtime object. It's used for both clientgo client and controller runtime client