Final updates to manifests (#161)

dell · Jun 15, 2023 · 55efa41 · 55efa41
1 parent 914548a
commit 55efa41
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -52,8 +52,8 @@ The Dell CSI Operator is itself installed as a Kubernetes deployment.
 ## Supported Platforms
 Dell CSI Operator has been tested and qualified with 
 
-    * Upstream Kubernetes cluster v1.24, v1.25, v1.26
-    * OpenShift Clusters 4.10, 4.11 with RHEL 8.x & RHCOS worker nodes
+    * Upstream Kubernetes cluster v1.25, v1.26, v1.27
+    * OpenShift Clusters 4.11, 4.12 with RHEL 8.x & RHCOS worker nodes
 
 ## Installation
 To install Dell CSI Operator please refer the steps given here at [https://dell.github.io/csm-docs/docs/csidriver/installation/operator/](https://dell.github.io/csm-docs/docs/csidriver/installation/operator/)

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -14,7 +14,7 @@ LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 # Labels for testing.
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
-LABEL com.redhat.openshift.versions=v4.10
+LABEL com.redhat.openshift.versions=v4.11-v4.12
 LABEL com.redhat.delivery.backport=false
 LABEL com.redhat.delivery.operator.bundle=true
 

diff --git a/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml
@@ -111,7 +111,8 @@ metadata:
                   ],
                   "name": "provisioner"
                 }
-              ]
+              ],
+              "storageCapacity": true
             }
           }
         },
@@ -174,7 +175,7 @@ metadata:
                 "image": "dellemc/csi-powermax:v2.7.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.6.0",
+              "configVersion": "v2.7.0",
               "controller": {
                 "nodeSelector": null,
                 "tolerations": null
@@ -284,7 +285,7 @@ metadata:
                 "envs": [
                   {
                     "name": "X_CSI_POWERSTORE_ENABLE_CHAP",
-                    "value": "true"
+                    "value": "false"
                   }
                 ],
                 "nodeSelector": null,
@@ -435,7 +436,6 @@ metadata:
     categories: Storage
     certified: "true"
     containerImage: docker.io/dellemc/dell-csi-operator:v1.12.0
-    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.11"}]'
     operators.operatorframework.io/builder: operator-sdk-v1.14.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/dell/dell-csi-operator

diff --git a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml
@@ -111,7 +111,8 @@ metadata:
                   ],
                   "name": "provisioner"
                 }
-              ]
+              ],
+              "storageCapacity": true
             }
           }
         },
@@ -174,7 +175,7 @@ metadata:
                 "image": "dellemc/csi-powermax:v2.7.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.6.0",
+              "configVersion": "v2.7.0",
               "controller": {
                 "nodeSelector": null,
                 "tolerations": null
@@ -284,7 +285,7 @@ metadata:
                 "envs": [
                   {
                     "name": "X_CSI_POWERSTORE_ENABLE_CHAP",
-                    "value": "true"
+                    "value": "false"
                   }
                 ],
                 "nodeSelector": null,
@@ -434,7 +435,6 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Storage
     containerImage: docker.io/dellemc/dell-csi-operator:v1.12.0
-    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.11"}]'
     operators.operatorframework.io/builder: operator-sdk-v1.14.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/dell/dell-csi-operator

diff --git a/config/manifests/bases/dell-csi-operator-certified.clusterserviceversion.yaml b/config/manifests/bases/dell-csi-operator-certified.clusterserviceversion.yaml
@@ -7,7 +7,6 @@ metadata:
     categories: Storage
     certified: "true"
     containerImage: docker.io/dellemc/dell-csi-operator:v1.12.0
-    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.11"}]'
     operators.operatorframework.io/builder: operator-sdk-v1.15.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/dell/dell-csi-operator

diff --git a/config/samples/storage_v1_csiisilon.yaml b/config/samples/storage_v1_csiisilon.yaml
@@ -11,6 +11,7 @@ spec:
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     fsGroupPolicy: ReadWriteOnceWithFSType
+    storageCapacity: true
     common:
       # Image for CSI PowerScale driver v2.7.0
       image: "dellemc/csi-isilon:v2.7.0"
@@ -197,4 +198,10 @@ spec:
       - name: common
         args: ["--leader-election-lease-duration=15s", "--leader-election-renew-deadline=10s", "--leader-election-retry-period=5s"]
       - name: provisioner
-        args: ["--volume-name-prefix=csipscale"]
+        args: ["--volume-name-prefix=csipscale"]
+
+      # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
+      # Configure when the storageCapacity is set as "true"
+      # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m
+      #- name: provisioner
+      #  args: ["--capacity-poll-interval=5m"]
diff --git a/config/samples/storage_v1_csipowerstore.yaml b/config/samples/storage_v1_csipowerstore.yaml
@@ -71,7 +71,7 @@ spec:
         # Set to "true" to enable ISCSI CHAP Authentication
         # CHAP password will be autogenerated by driver
         - name: "X_CSI_POWERSTORE_ENABLE_CHAP"
-          value: "true"
+          value: "false"
 
       # nodeSelector: Define node selection constraints for node pods.
       # For the pod to be eligible to run on a node, the node must have each