From d236968bf9feb31020fc1ed30f9f77af4045aaed Mon Sep 17 00:00:00 2001
From: Benjamin Guillon <benjamin.guillon@cc.in2p3.fr>
Date: Mon, 28 Feb 2022 17:00:35 +0100
Subject: [PATCH] helm: remove kube version semver check for CSI cephfs resizer
 component

It was decided that latest ceph CSI versions would drop support for
older Kubernetes versions, making this check useless. So it was removed.

Removing this version check allows for the deployment of the CephFS
resizer component when using the helm chart on non vanilla kubernetes
clusters whose API server version are in the form of `1.x.y-abc+def-ghi`.

Signed-off-by: Benjamin Guillon <benjamin.guillon@cc.in2p3.fr>
---
 charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml | 2 --
 charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml
index a3cc5377d..280e300e6 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml
@@ -48,13 +48,11 @@ rules:
     resources: ["volumeattachments/status"]
     verbs: ["patch"]
 {{- end -}}
-{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.Version -}}
 {{- if .Values.provisioner.resizer.enabled }}
   - apiGroups: [""]
     resources: ["persistentvolumeclaims/status"]
     verbs: ["update", "patch"]
 {{- end -}}
-{{- end -}}
 {{- if .Values.topology.enabled }}
   - apiGroups: [""]
     resources: ["nodes"]
diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
index 762937d41..c455b8690 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
@@ -107,7 +107,6 @@ spec:
           resources:
 {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
 {{- end }}
-{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.Version -}}
 {{- if .Values.provisioner.resizer.enabled }}
         - name: csi-resizer
           image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
@@ -127,7 +126,6 @@ spec:
               mountPath: /csi
           resources:
 {{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
-{{- end }}
 {{- end }}
         - name: csi-cephfsplugin
           image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"