Final updates to manifests (#114)

dell · Nov 24, 2022 · 5a740ea · 5a740ea
1 parent de3505a
commit 5a740ea
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.22
+ENVTEST_K8S_VERSION = 1.23
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

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.9
+LABEL com.redhat.openshift.versions=v4.10
 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
@@ -52,10 +52,10 @@ metadata:
                     "value": "192"
                   }
                 ],
-                "image": "dellemc/csi-isilon:v2.4.0",
+                "image": "dellemc/csi-isilon:v2.5.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.4.0",
+              "configVersion": "v2.5.0",
               "controller": {
                 "envs": [
                   {
@@ -69,6 +69,10 @@ metadata:
                   {
                     "name": "X_CSI_ISI_VOLUME_PATH_PERMISSIONS",
                     "value": "0777"
+                  },
+                  {
+                    "name": "X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS",
+                    "value": "false"
                   }
                 ],
                 "nodeSelector": null,
@@ -144,11 +148,35 @@ metadata:
                   },
                   {
                     "name": "X_CSI_POWERMAX_PROXY_SERVICE_NAME",
-                    "value": ""
+                    "value": "powermax-reverseproxy"
                   },
                   {
                     "name": "X_CSI_GRPC_MAX_THREADS",
                     "value": "4"
+                  },
+                  {
+                    "name": "X_CSI_VSPHERE_ENABLED",
+                    "value": "false"
+                  },
+                  {
+                    "name": "X_CSI_VSPHERE_PORTGROUP",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VSPHERE_HOSTGROUP",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VCenter_HOST",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VCenter_USERNAME",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VCenter_PWD",
+                    "value": ""
                   }
                 ],
                 "image": "dellemc/csi-powermax:v2.5.0",
@@ -270,7 +298,8 @@ metadata:
                 "nodeSelector": null,
                 "tolerations": null
               },
-              "replicas": 2
+              "replicas": 2,
+              "storageCapacity": true
             }
           }
         },
@@ -349,7 +378,7 @@ metadata:
                 "image": "dellemc/csi-vxflexos:v2.5.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.4.0",
+              "configVersion": "v2.5.0",
               "controller": {
                 "envs": null,
                 "nodeSelector": null,
@@ -1966,6 +1995,18 @@ spec:
           - list
           - update
           - watch
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - csistoragecapacities
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - storage.k8s.io
           resources:

diff --git a/bundle/manifests/storage.dell.com_csiisilons.yaml b/bundle/manifests/storage.dell.com_csiisilons.yaml
@@ -1012,6 +1012,9 @@ spec:
                       - name
                       type: object
                     type: array
+                  storageCapacity:
+                    description: StorageCapacity enables/disables capacity tracking
+                    type: boolean
                   storageClass:
                     description: StorageClass is the specification for Storage Classes
                     items:

diff --git a/bundle/manifests/storage.dell.com_csipowermaxes.yaml b/bundle/manifests/storage.dell.com_csipowermaxes.yaml
@@ -1012,6 +1012,9 @@ spec:
                       - name
                       type: object
                     type: array
+                  storageCapacity:
+                    description: StorageCapacity enables/disables capacity tracking
+                    type: boolean
                   storageClass:
                     description: StorageClass is the specification for Storage Classes
                     items:

diff --git a/bundle/manifests/storage.dell.com_csipowerstores.yaml b/bundle/manifests/storage.dell.com_csipowerstores.yaml
@@ -1012,6 +1012,9 @@ spec:
                       - name
                       type: object
                     type: array
+                  storageCapacity:
+                    description: StorageCapacity enables/disables capacity tracking
+                    type: boolean
                   storageClass:
                     description: StorageClass is the specification for Storage Classes
                     items:

diff --git a/bundle/manifests/storage.dell.com_csiunities.yaml b/bundle/manifests/storage.dell.com_csiunities.yaml
@@ -1012,6 +1012,9 @@ spec:
                       - name
                       type: object
                     type: array
+                  storageCapacity:
+                    description: StorageCapacity enables/disables capacity tracking
+                    type: boolean
                   storageClass:
                     description: StorageClass is the specification for Storage Classes
                     items:

diff --git a/bundle/manifests/storage.dell.com_csivxflexoses.yaml b/bundle/manifests/storage.dell.com_csivxflexoses.yaml
@@ -1012,6 +1012,9 @@ spec:
                       - name
                       type: object
                     type: array
+                  storageCapacity:
+                    description: StorageCapacity enables/disables capacity tracking
+                    type: boolean
                   storageClass:
                     description: StorageClass is the specification for Storage Classes
                     items:

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -15,4 +15,4 @@ annotations:
   operators.operatorframework.io.test.config.v1: tests/scorecard/
 
   # Annotations to specify supported OCP versions.
-  com.redhat.openshift.versions: v4.9
+  com.redhat.openshift.versions: v4.10
diff --git a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml
@@ -69,6 +69,10 @@ metadata:
                   {
                     "name": "X_CSI_ISI_VOLUME_PATH_PERMISSIONS",
                     "value": "0777"
+                  },
+                  {
+                    "name": "X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS",
+                    "value": "false"
                   }
                 ],
                 "nodeSelector": null,
@@ -144,11 +148,35 @@ metadata:
                   },
                   {
                     "name": "X_CSI_POWERMAX_PROXY_SERVICE_NAME",
-                    "value": ""
+                    "value": "powermax-reverseproxy"
                   },
                   {
                     "name": "X_CSI_GRPC_MAX_THREADS",
                     "value": "4"
+                  },
+                  {
+                    "name": "X_CSI_VSPHERE_ENABLED",
+                    "value": "false"
+                  },
+                  {
+                    "name": "X_CSI_VSPHERE_PORTGROUP",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VSPHERE_HOSTGROUP",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VCenter_HOST",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VCenter_USERNAME",
+                    "value": ""
+                  },
+                  {
+                    "name": "X_CSI_VCenter_PWD",
+                    "value": ""
                   }
                 ],
                 "image": "dellemc/csi-powermax:v2.5.0",
@@ -270,7 +298,8 @@ metadata:
                 "nodeSelector": null,
                 "tolerations": null
               },
-              "replicas": 2
+              "replicas": 2,
+              "storageCapacity": true
             }
           }
         },
@@ -349,7 +378,7 @@ metadata:
                 "image": "dellemc/csi-vxflexos:v2.5.0",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.4.0",
+              "configVersion": "v2.5.0",
               "controller": {
                 "envs": null,
                 "nodeSelector": null,
@@ -1965,6 +1994,18 @@ spec:
           - list
           - update
           - watch
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - csistoragecapacities
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - storage.k8s.io
           resources:

diff --git a/config/samples/storage_v1_csiisilon.yaml b/config/samples/storage_v1_csiisilon.yaml
@@ -134,18 +134,12 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       nodeSelector:
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
-      #  node-role.kubernetes.io/master: ""
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  node-role.kubernetes.io/control-plane: ""
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
       tolerations:
-      # - key: "node-role.kubernetes.io/master"
-      #   operator: "Exists"
-      #   effect: "NoSchedule"
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       # - key: "node-role.kubernetes.io/control-plane"
       #   operator: "Exists"
@@ -178,14 +172,11 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       nodeSelector:
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
-      #  node-role.kubernetes.io/master: ""
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  node-role.kubernetes.io/control-plane: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
       tolerations:
       #  - key: "node.kubernetes.io/memory-pressure"
       #    operator: "Exists"
@@ -196,9 +187,6 @@ spec:
       #  - key: "node.kubernetes.io/network-unavailable"
       #    operator: "Exists"
       #    effect: "NoExecute"
-      #  - key: "node-role.kubernetes.io/master"
-      #    operator: "Exists"
-      #    effect: "NoSchedule"
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  - key: "node-role.kubernetes.io/control-plane"
       #    operator: "Exists"

diff --git a/config/samples/storage_v1_csipowermax.yaml b/config/samples/storage_v1_csipowermax.yaml
@@ -63,17 +63,52 @@ spec:
         - name: "X_CSI_TRANSPORT_PROTOCOL"
           value: ""
         # X_CSI_POWERMAX_PROXY_SERVICE_NAME: Refers to the name of the proxy service in kubernetes
-        # Set this to "powermax-reverseproxy" if you are installing the proxy
         # Allowed values: "powermax-reverseproxy"
-        # default values: "" <empty>
+        # default values: "powermax-reverseproxy"
         - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME"
-          value: ""
+          value: "powermax-reverseproxy"
         # X_CSI_GRPC_MAX_THREADS: Defines the maximum number of concurrent grpc requests.
         # Set this value to a higher number (max 50) if you are using the proxy
         # Allowed values: n, where n > 4
         # default values: None
         - name: "X_CSI_GRPC_MAX_THREADS"
           value: "4"
+        # VMware/vSphere virtualization support
+        # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM
+        # Allowed values:
+        #   "true" - vSphere volumes are enabled
+        #   "false" - vSphere volumes are disabled
+        # Default value: "false"
+        - name: "X_CSI_VSPHERE_ENABLED"
+          value: "false"
+        # X_CSI_VSPHERE_PORTGROUP: An existing portGroup that driver will use for vSphere
+        # recommended format: csi-x-VC-PG, x can be anything of user choice
+        # Allowed value: valid existing port group on the array
+        # Default value: "" <empty>
+        - name: "X_CSI_VSPHERE_PORTGROUP"
+          value: ""
+        # X_CSI_VSPHERE_HOSTGROUP: An existing host group that driver will use for vSphere
+        # this hostGroup should contain initiators from all the ESXs/ESXi host where the cluster is deployed
+        # recommended format: csi-x-VC-HG, x can be anything of user choice
+        # Allowed value: valid existing port group on the array
+        # Default value: "" <empty>
+        - name: "X_CSI_VSPHERE_HOSTGROUP"
+          value: ""
+        # X_CSI_VCenter_HOST: URL/endpoint of the vCenter where all the ESX are present
+        # Allowed value: valid vCenter host endpoint
+        # Default value: "" <empty>
+        - name: "X_CSI_VCenter_HOST"
+          value: ""
+        # X_CSI_VCenter_USERNAME: username from the vCenter credentials
+        # Allowed value: valid vCenter host username
+        # Default value: "" <empty>
+        - name: "X_CSI_VCenter_USERNAME"
+          value: ""
+        # X_CSI_VCenter_PWD: password from the vCenter credentials
+        # Allowed value: valid vCenter host password
+        # Default value: "" <empty>
+        - name: "X_CSI_VCenter_PWD"
+          value: ""
     controller:
       # nodeSelector: Define node selection constraints for controller pods.
       # For the pod to be eligible to run on a node, the node must have each
@@ -82,8 +117,6 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       nodeSelector:
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
-      #  node-role.kubernetes.io/master: ""
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  node-role.kubernetes.io/control-plane: ""
 
@@ -92,10 +125,6 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       tolerations:
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
-      #  - key: "node-role.kubernetes.io/master"
-      #    operator: "Exists"
-      #    effect: "NoSchedule"
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  - key: "node-role.kubernetes.io/control-plane"
       #    operator: "Exists"
@@ -127,8 +156,6 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       nodeSelector:
-      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
-      #  node-role.kubernetes.io/master: ""
       # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  node-role.kubernetes.io/control-plane: ""