From d236968bf9feb31020fc1ed30f9f77af4045aaed Mon Sep 17 00:00:00 2001 From: Benjamin Guillon Date: Mon, 28 Feb 2022 17:00:35 +0100 Subject: [PATCH 1/2] 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 --- 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 }}" From dec74a534f69d9e54595961e08f4b5080286ee87 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 7 Mar 2022 16:01:49 +0530 Subject: [PATCH 2/2] doc: add step to create `ceph-conf` cm to deploy plugin Ceph-csi requires `ceph-config` configmap when deploying. Add this step to `examples/README.md`. Fixes: #2918 Signed-off-by: Rakshith R --- examples/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/README.md b/examples/README.md index a5c719ac0..674e26c57 100644 --- a/examples/README.md +++ b/examples/README.md @@ -2,6 +2,12 @@ ## Deploying Ceph-CSI services +Create [ceph-config](./ceph-conf.yaml) configmap using the following command. + +```bash +kubectl apply -f ./ceph-conf.yaml +``` + Both `rbd` and `cephfs` directories contain `plugin-deploy.sh` and `plugin-teardown.sh` helper scripts. You can use those to help you deploy/teardown RBACs, sidecar containers and the plugin in one go.