update pscale version and minor fixes

dell · May 15, 2023 · 6be4267 · 6be4267
1 parent a10d524
commit 6be4267
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 14 deletions.
diff --git a/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml
@@ -52,10 +52,10 @@ metadata:
                     "value": "192"
                   }
                 ],
-                "image": "dellemc/csi-isilon:v2.6.0",
+                "image": "dellemc/csi-isilon:v2.7.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.6.0",
+              "configVersion": "v2.7.0",
               "controller": {
                 "envs": [
                   {

diff --git a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml
@@ -52,10 +52,10 @@ metadata:
                     "value": "192"
                   }
                 ],
-                "image": "dellemc/csi-isilon:v2.6.0",
+                "image": "dellemc/csi-isilon:v2.7.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.6.0",
+              "configVersion": "v2.7.0",
               "controller": {
                 "envs": [
                   {

diff --git a/driverconfig/config.yaml b/driverconfig/config.yaml
@@ -5,6 +5,7 @@ supportedK8sVersions:
   - v124
   - v125
   - v126
+  - v127
 drivers:
   - name: powermax
     configVersions:

diff --git a/test/controller_test.go b/test/controller_test.go
@@ -202,7 +202,7 @@ func (suite *ControllerTestSuite) SetupSuite() {
 			reconciler: &controllers.CSIIsilonReconciler{
 				Log: ctrl.Log.WithName("controllers").WithName("CSIIsilon"),
 			},
-			k8sVersion: "v125",
+			k8sVersion: "v127",
 			findCR: func(inObjects []runtime.Object) (string, string) {
 				for _, o := range inObjects {
 					if cr, ok := o.(*v1.CSIIsilon); ok {

diff --git a/test/testdata/csiisilon/01-simple-deployment/in-csiisilon.yaml b/test/testdata/csiisilon/01-simple-deployment/in-csiisilon.yaml
@@ -5,15 +5,15 @@ metadata:
   namespace: test-isilon
 spec:
   driver:
-    # Config version for CSI PowerScale v2.6.0 driver
-    configVersion: v2.6.0
+    # Config version for CSI PowerScale v2.7.0 driver
+    configVersion: v2.7.0
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     storageCapacity: false
     common:
-      # Image for CSI PowerScale driver v2.6.0
-      image: "dellemc/csi-isilon:v2.6.0"
+      # Image for CSI PowerScale driver v2.7.0
+      image: "dellemc/csi-isilon:v2.7.0"
       imagePullPolicy: IfNotPresent
       envs:
         # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs

diff --git a/test/testdata/csiisilon/01-simple-deployment/out-csiisilon.yaml b/test/testdata/csiisilon/01-simple-deployment/out-csiisilon.yaml
@@ -2,7 +2,7 @@ apiVersion: storage.dell.com/v1
 kind: CSIIsilon
 metadata:
   annotations:
-    storage.dell.com/CSIDriverConfigVersion: v2.6.0
+    storage.dell.com/CSIDriverConfigVersion: v2.7.0
     storage.dell.com/attacher.Image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
     storage.dell.com/attacher.Image.IsDefault: "true"
     storage.dell.com/provisioner.Image: k8s.gcr.io/sig-storage/csi-provisioner:v3.4.0
@@ -40,9 +40,9 @@ spec:
         value: "0"
       - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED
         value: "false"
-      image: dellemc/csi-isilon:v2.6.0
+      image: dellemc/csi-isilon:v2.7.0
       imagePullPolicy: IfNotPresent
-    configVersion: v2.6.0
+    configVersion: v2.7.0
     controller:
       envs:
       - name: X_CSI_ISI_QUOTA_ENABLED

diff --git a/test/testdata/csiisilon/01-simple-deployment/out-daemonset.yaml b/test/testdata/csiisilon/01-simple-deployment/out-daemonset.yaml
@@ -64,7 +64,7 @@ spec:
           value: /ifs/data/csi
         - name: X_CSI_ISI_NO_PROBE_ON_START
           value: "false"
-        image: dellemc/csi-isilon:v2.6.0
+        image: dellemc/csi-isilon:v2.7.0
         imagePullPolicy: IfNotPresent
         name: driver
         resources: {}

diff --git a/test/testdata/csiisilon/01-simple-deployment/out-deployment.yaml b/test/testdata/csiisilon/01-simple-deployment/out-deployment.yaml
@@ -72,7 +72,7 @@ spec:
           value: "true"
         - name: X_CSI_ISI_ACCESS_ZONE
           value: System
-        image: dellemc/csi-isilon:v2.6.0
+        image: dellemc/csi-isilon:v2.7.0
         imagePullPolicy: IfNotPresent
         name: driver
         resources: {}
@@ -121,9 +121,20 @@ spec:
         - "--monitor-interval=60s"
         - "--enable-node-watcher=true"
         - "--http-endpoint=:8080"
+        - --enable-capacity=true
+        - --capacity-ownerref-level=2
+        - --capacity-poll-interval=5m
         env:
         - name: ADDRESS
           value: /var/run/csi/csi.sock
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         image: gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.8.0
         imagePullPolicy: IfNotPresent
         name: external-health-monitor
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ supportedK8sVersions: @@
       - v124
       - v125
       - v126
+      - v127
     drivers:
       - name: powermax
         configVersions:
@@ Expand Down @@