mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

helm: remove kube version semver check for CSI cephfs resizer component

Browse Source 
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>
This commit is contained in:
Benjamin Guillon 2022-02-28 17:00:35 +01:00 committed by mergify[bot]
parent 3a64ee48c3
commit d236968bf9
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml
View File

@ -48,13 +48,11 @@ rules:
resources: ["volumeattachments/status"] resources: ["volumeattachments/status"]
verbs: ["patch"] verbs: ["patch"]
{{- end -}} {{- end -}}
{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.Version -}}
{{- if .Values.provisioner.resizer.enabled }} {{- if .Values.provisioner.resizer.enabled }}
- apiGroups: [""] - apiGroups: [""]
resources: ["persistentvolumeclaims/status"] resources: ["persistentvolumeclaims/status"]
verbs: ["update", "patch"] verbs: ["update", "patch"]
{{- end -}} {{- end -}}
{{- end -}}
{{- if .Values.topology.enabled }} {{- if .Values.topology.enabled }}
- apiGroups: [""] - apiGroups: [""]
resources: ["nodes"] resources: ["nodes"]

2
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
View File

@ -107,7 +107,6 @@ spec:
resources: resources:
{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
{{- end }} {{- end }}
{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.Version -}}
{{- if .Values.provisioner.resizer.enabled }} {{- if .Values.provisioner.resizer.enabled }}
- name: csi-resizer - name: csi-resizer
image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
@ -127,7 +126,6 @@ spec:
mountPath: /csi mountPath: /csi
resources: resources:
{{ toYaml .Values.provisioner.resizer.resources | indent 12 }} {{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
{{- end }}
{{- end }} {{- end }}
- name: csi-cephfsplugin - name: csi-cephfsplugin
image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"