Merge pull request #87 from ceph/devel

Sync rhs/ceph:devel with ceph/ceph:devel

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"]

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 }}"

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.