Add CSI-PowerFlex v2.9 support to csm-operator

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

@@ -912,10 +912,10 @@ metadata:
                     "value": "false"
                   }
                 ],
-                "image": "dellemc/csi-vxflexos:v2.8.0",
+                "image": "dellemc/csi-vxflexos:v2.9.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.8.0",
+              "configVersion": "v2.9.0",
               "controller": {
                 "envs": [
                   {
@@ -942,7 +942,7 @@ metadata:
                       "value": "10.xx.xx.xx,10.xx.xx.xx"
                     }
                   ],
-                  "image": "dellemc/sdc:3.6.1",
+                  "image": "dellemc/sdc:4.5",
                   "imagePullPolicy": "IfNotPresent",
                   "name": "sdc"
                 }
@@ -983,7 +983,7 @@ metadata:
                       "value": "10.xx.xx.xx,10.xx.xx.xx"
                     }
                   ],
-                  "image": "dellemc/sdc:3.6.1",
+                  "image": "dellemc/sdc:4.5",
                   "name": "sdc-monitor"
                 },
                 {
@@ -2487,9 +2487,9 @@ spec:
     name: csi-powerstore
   - image: docker.io/dellemc/csi-unity:v2.8.0
     name: csi-unity
-  - image: docker.io/dellemc/csi-vxflexos:v2.8.0
+  - image: docker.io/dellemc/csi-vxflexos:v2.9.0
     name: csi-vxflexos
-  - image: docker.io/dellemc/sdc:3.6.1
+  - image: docker.io/dellemc/sdc:4.5
     name: sdc
   - image: docker.io/dellemc/csm-authorization-sidecar:v1.8.0
     name: karavi-authorization-proxy

config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml

@@ -499,9 +499,9 @@ spec:
     name: csi-powerstore
   - image: docker.io/dellemc/csi-unity:v2.8.0
     name: csi-unity
-  - image: docker.io/dellemc/csi-vxflexos:v2.8.0
+  - image: docker.io/dellemc/csi-vxflexos:v2.9.0
     name: csi-vxflexos
-  - image: docker.io/dellemc/sdc:3.6.1
+  - image: docker.io/dellemc/sdc:4.5
     name: sdc
   - image: docker.io/dellemc/csm-authorization-sidecar:v1.8.0
     name: karavi-authorization-proxy

config/samples/storage_v1_csm_powerflex.yaml

@@ -16,13 +16,13 @@ spec:
       #   true: enable storage capacity tracking
       #   false: disable storage capacity tracking
       storageCapacity: true
-    configVersion: v2.8.0
+    configVersion: v2.9.0
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     forceRemoveDriver: true
     common:
-      image: "dellemc/csi-vxflexos:v2.8.0"
+      image: "dellemc/csi-vxflexos:v2.9.0"
       imagePullPolicy: IfNotPresent
       envs:
         - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT
@@ -49,7 +49,7 @@ spec:
     # sdc-monitor is disabled by default, due to high CPU usage
       - name: sdc-monitor
         enabled: false
-        image: dellemc/sdc:3.6.1
+        image: dellemc/sdc:4.5
         envs:
         - name: HOST_PID
           value: "1"
@@ -161,7 +161,7 @@ spec:
       #   effect: "NoSchedule"
 
     initContainers:
-      - image: dellemc/sdc:3.6.1
+      - image: dellemc/sdc:4.5
         imagePullPolicy: IfNotPresent
         name: sdc
         envs:

operatorconfig/driverconfig/common/default.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

operatorconfig/driverconfig/common/k8s-1.21-values.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.7.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

operatorconfig/driverconfig/common/k8s-1.22-values.yaml

@@ -24,4 +24,4 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.6.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5

operatorconfig/driverconfig/common/k8s-1.23-values.yaml

@@ -24,4 +24,4 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.8.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5

operatorconfig/driverconfig/common/k8s-1.24-values.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

operatorconfig/driverconfig/common/k8s-1.25-values.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

operatorconfig/driverconfig/common/k8s-1.26-values.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

operatorconfig/driverconfig/common/k8s-1.27-values.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

operatorconfig/driverconfig/common/k8s-1.28-values.yaml

@@ -24,7 +24,7 @@ images:
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
 
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:3.6.1
+  sdcmonitor: dellemc/sdc:4.5
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: dellemc/csi-metadata-retriever:v1.4.0

tests/config/driverconfig/powerflex/v2.8.0/controller.yaml → operatorconfig/driverconfig/powerflex/v2.9.0/controller.yaml

@@ -123,7 +123,7 @@ spec:
       serviceAccountName: <DriverDefaultReleaseName>-controller
       containers:
         - name: attacher
-          image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.4.1
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -136,7 +136,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: provisioner
-          image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+          image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -166,7 +166,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: csi-external-health-monitor-controller
-          image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
+          image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -183,7 +183,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: snapshotter
-          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
+          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -197,7 +197,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: resizer
-          image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -210,7 +210,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: driver
-          image: dellemc/csi-vxflexos:v2.8.0
+          image: dellemc/csi-vxflexos:v2.9.0
           imagePullPolicy: IfNotPresent
           command: [ "/csi-vxflexos.sh" ]
           args:
@@ -231,7 +231,7 @@ spec:
             - name: X_CSI_HEALTH_MONITOR_ENABLED
               value: false
             - name: X_CSI_QUOTA_ENABLED
-              value: false
+              value: <X_CSI_QUOTA_ENABLED>
           volumeMounts:
             - name: socket-dir
               mountPath: /var/run/csi

tests/config/driverconfig/powerflex/v2.8.0/csidriver.yaml → operatorconfig/driverconfig/powerflex/v2.9.0/csidriver.yaml

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

operatorconfig/driverconfig/powerflex/v2.6.0/node.yaml → operatorconfig/driverconfig/powerflex/v2.9.0/node.yaml

@@ -82,7 +82,7 @@ spec:
             allowPrivilegeEscalation: true
             capabilities:
               add: ["SYS_ADMIN"]
-          image: dellemc/csi-vxflexos:v2.6.0
+          image: dellemc/csi-vxflexos:v2.9.0
           imagePullPolicy: IfNotPresent
           command: [ "/csi-vxflexos.sh" ]
           args:
@@ -107,6 +107,8 @@ spec:
               value: <X_CSI_RENAME_SDC_ENABLED>
             - name: X_CSI_RENAME_SDC_PREFIX
               value: <X_CSI_RENAME_SDC_PREFIX>
+            - name: X_CSI_MAX_VOLUMES_PER_NODE
+              value: <X_CSI_MAX_VOLUMES_PER_NODE>
           volumeMounts:
             - name: driver-path
               mountPath: <KUBELET_CONFIG_DIR>/plugins/vxflexos.emc.dell.com
@@ -126,7 +128,7 @@ spec:
               mountPath: /certs
               readOnly: true
         - name: registrar
-          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
@@ -148,7 +150,7 @@ spec:
         - name: sdc-monitor
           securityContext:
             privileged: true
-          image: dellemc/sdc:3.6.0.6
+          image: dellemc/sdc:4.5
           imagePullPolicy: IfNotPresent
           env:
             - name: HOST_PID
@@ -174,7 +176,7 @@ spec:
         - name: sdc
           securityContext:
             privileged: true
-          image: dellemc/sdc:3.6.0.6
+          image: dellemc/sdc:4.5
           imagePullPolicy: IfNotPresent
           env:
             - name: NODENAME

operatorconfig/driverconfig/powerflex/v2.9.0/upgrade-path.yaml

@@ -0,0 +1,2 @@
+
+minUpgradePath: v2.8.0

operatorconfig/moduleconfig/common/version-values.yaml

@@ -17,10 +17,6 @@ powerscale:
       resiliency: "v1.7.0"
 powerflex:
   # List of Driver versions and modules that supports the version
-  v2.6.0:
-      authorization: "v1.6.0"
-      observability: "v1.5.0"
-      replication: "v1.4.0"
   v2.7.0:
       authorization: "v1.7.0"
       observability: "v1.5.0"
@@ -31,6 +27,11 @@ powerflex:
       observability: "v1.6.0"
       replication: "v1.6.0"
       resiliency: "v1.6.0"
+  v2.9.0:
+      authorization: "v1.7.0"
+      observability: "v1.6.0"
+      replication: "v1.6.0"
+      resiliency: "v1.6.0"
 powerstore:
   # List of Driver versions and modules that supports the version
   v2.7.0:

pkg/modules/testdata/cr_powerflex_replica.yaml

@@ -11,7 +11,7 @@ spec:
       # Allowed values: ReadWriteOnceWithFSType, File , None
       # Default value: ReadWriteOnceWithFSType
       fSGroupPolicy: "File"
-    configVersion: v2.6.0
+    configVersion: v2.9.0
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
@@ -22,7 +22,7 @@ spec:
       enabled: true
       components:
       - name: dell-csi-replicator
-        image: dellemc/dell-csi-replicator:v1.4.0
+        image: dellemc/dell-csi-replicator:v1.6.0
         envs:
           - name: "X_CSI_REPLICATION_PREFIX"
             value: "replication.storage.dell.com"
@@ -31,7 +31,7 @@ spec:
 
 
       - name: dell-replication-controller-manager
-        image: dellemc/dell-replication-controller:v1.4.0
+        image: dellemc/dell-replication-controller:v1.6.0
         envs:
           - name: "TARGET_CLUSTERS_IDS"
             value: "test-target-cluster-1,test-target-cluster-2"