From 5a740ea7f149e1c7575c40456f7a64aba46ea88d Mon Sep 17 00:00:00 2001 From: rensyct <80810999+rensyct@users.noreply.github.com> Date: Thu, 24 Nov 2022 14:20:36 +0530 Subject: [PATCH] Final updates to manifests (#114) --- Makefile | 2 +- bundle.Dockerfile | 2 +- ...rator-certified.clusterserviceversion.yaml | 51 +++++++++++++++++-- .../storage.dell.com_csiisilons.yaml | 3 ++ .../storage.dell.com_csipowermaxes.yaml | 3 ++ .../storage.dell.com_csipowerstores.yaml | 3 ++ .../storage.dell.com_csiunities.yaml | 3 ++ .../storage.dell.com_csivxflexoses.yaml | 3 ++ bundle/metadata/annotations.yaml | 2 +- ...ll-csi-operator.clusterserviceversion.yaml | 47 +++++++++++++++-- config/samples/storage_v1_csiisilon.yaml | 12 ----- config/samples/storage_v1_csipowermax.yaml | 49 ++++++++++++++---- config/samples/storage_v1_csipowerstore.yaml | 17 ++----- config/samples/storage_v1_csiunity.yaml | 12 ----- config/samples/storage_v1_csivxflexos.yaml | 16 +----- controllers/csipowerstore_controller.go | 2 +- controllers/csiunity_controller.go | 2 +- controllers/csivxflexos_controller.go | 2 +- driverconfig/config.yaml | 12 ----- 19 files changed, 154 insertions(+), 89 deletions(-) diff --git a/Makefile b/Makefile index 25804a3..d31cb27 100644 --- 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 index 5e2582c..66a6900 100644 --- 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 index 4311575..360625c 100644 --- 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 index 566d501..222ec81 100644 --- 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 index 9275af4..dcf6aab 100644 --- 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 index d39dd3d..b0b5a12 100644 --- 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 index 2f4e0fe..67cf4bc 100644 --- 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 index 062d717..d777197 100644 --- 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 index 682531b..0f2334b 100644 --- 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 index e4ef8fc..b00ec2e 100644 --- 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 index 56e0f41..72e8ecb 100644 --- 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 index 84edecf..1e65d17 100644 --- 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: "" + # 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: "" + - 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: "" + - 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: "" + - name: "X_CSI_VCenter_HOST" + value: "" + # X_CSI_VCenter_USERNAME: username from the vCenter credentials + # Allowed value: valid vCenter host username + # Default value: "" + - name: "X_CSI_VCenter_USERNAME" + value: "" + # X_CSI_VCenter_PWD: password from the vCenter credentials + # Allowed value: valid vCenter host password + # Default value: "" + - 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: "" diff --git a/config/samples/storage_v1_csipowerstore.yaml b/config/samples/storage_v1_csipowerstore.yaml index 0e89d9d..f2bb660 100644 --- a/config/samples/storage_v1_csipowerstore.yaml +++ b/config/samples/storage_v1_csipowerstore.yaml @@ -12,6 +12,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceUpdate: false fsGroupPolicy: ReadWriteOnceWithFSType + storageCapacity: true common: # Image for CSI PowerStore driver v2.5.0 image: "dellemc/csi-powerstore:v2.5.0" @@ -24,7 +25,7 @@ spec: controller: envs: # X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory - # This value will be the default value if a storage class and array config in secret + # This value will be the default value if a storage class and array config in secret # do not contain the NFS ACL (nfsAcls) parameter specified # Permissions can be specified in two formats: # 1) Unix mode (NFSv3) @@ -40,7 +41,7 @@ spec: # nfsAcls: "0777" - name: X_CSI_NFS_ACLS value: "0777" - + # nodeSelector: Define node selection constraints for controller pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -48,8 +49,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: "" @@ -57,10 +56,6 @@ spec: # Leave as blank to install controller on worker nodes # 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" @@ -79,8 +74,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: "" @@ -88,10 +81,6 @@ spec: # Leave as blank to install controller on worker nodes # 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" diff --git a/config/samples/storage_v1_csiunity.yaml b/config/samples/storage_v1_csiunity.yaml index 8e03c61..2ac1b46 100644 --- a/config/samples/storage_v1_csiunity.yaml +++ b/config/samples/storage_v1_csiunity.yaml @@ -34,8 +34,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: "" @@ -43,10 +41,6 @@ spec: # Leave as blank to install controller on worker nodes # 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" @@ -60,18 +54,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 node daemonset, if required. # 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" diff --git a/config/samples/storage_v1_csivxflexos.yaml b/config/samples/storage_v1_csivxflexos.yaml index bdc62d8..acffadd 100644 --- a/config/samples/storage_v1_csivxflexos.yaml +++ b/config/samples/storage_v1_csivxflexos.yaml @@ -39,8 +39,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: "" @@ -48,11 +46,7 @@ spec: # Leave as blank to install controller on worker nodes # 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 + # 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" # effect: "NoSchedule" @@ -65,8 +59,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: "" @@ -74,11 +66,7 @@ spec: # Leave as blank to install node driver only on worker nodes # 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 + # 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" # effect: "NoSchedule" diff --git a/controllers/csipowerstore_controller.go b/controllers/csipowerstore_controller.go index da4138e..3ffbab4 100644 --- a/controllers/csipowerstore_controller.go +++ b/controllers/csipowerstore_controller.go @@ -70,7 +70,7 @@ type CSIPowerStoreReconciler struct { // +kubebuilder:rbac:groups="security.openshift.io",resources=securitycontextconstraints,resourceNames=privileged,verbs=use // +kubebuilder:rbac:groups="storage.k8s.io",resources=csistoragecapacities,verbs=get;list;watch;create;update;patch;delete -//Reconcile function reconciles a CSIPowerStore Object +// Reconcile function reconciles a CSIPowerStore Object func (r *CSIPowerStoreReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { log := r.Log.WithValues("csipowerstore", req.NamespacedName) diff --git a/controllers/csiunity_controller.go b/controllers/csiunity_controller.go index 4a773dc..34be616 100644 --- a/controllers/csiunity_controller.go +++ b/controllers/csiunity_controller.go @@ -153,7 +153,7 @@ func (r *CSIUnityReconciler) SetConfig(c operatorconfig.Config) { r.Config = c } -//IncrUpdateCount - Increments the update count +// IncrUpdateCount - Increments the update count func (r *CSIUnityReconciler) IncrUpdateCount() { atomic.AddInt32(&r.updateCount, 1) } diff --git a/controllers/csivxflexos_controller.go b/controllers/csivxflexos_controller.go index 963434f..e37aa1e 100644 --- a/controllers/csivxflexos_controller.go +++ b/controllers/csivxflexos_controller.go @@ -120,7 +120,7 @@ func (r *CSIVXFlexOSReconciler) SetConfig(c operatorconfig.Config) { r.Config = c } -//IncrUpdateCount - Increments the update count +// IncrUpdateCount - Increments the update count func (r *CSIVXFlexOSReconciler) IncrUpdateCount() { atomic.AddInt32(&r.updateCount, 1) } diff --git a/driverconfig/config.yaml b/driverconfig/config.yaml index 9dc4a2d..7a1b23b 100644 --- a/driverconfig/config.yaml +++ b/driverconfig/config.yaml @@ -75,18 +75,6 @@ drivers: resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1 external-health-monitor: gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.5.0 - - configVersion: v2.2.0 - useDefaults: false - supportedVersions: - - version: v121 - - version: v122 - - version: v123 - attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 - provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 - snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1 - resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 - registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0 - external-health-monitor: gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0 - name: vxflexos configVersions: - configVersion: v2.5.0