cephfs/deploy/k8s: updated naming and some permissions

deploy/cephfs/kubernetes/cephfs-storage-class.yaml

@@ -1,12 +1,12 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: cephfs
+  name: csi-cephfs
-provisioner: cephfsplugin
+provisioner: csi-cephfsplugin
 parameters:
-  adminID: admin
+  monitors: 192.168.122.11:6789
-  adminSecret: AQCdsp9aaowqEhAAHx5EFnTQBnTU7Dr1UzHwmQ==
+  rootPath: /
-  clusterName: ceph
+  user: admin
-  pool: cephfs
+  csiProvisionerSecretName: csi-cephfs-secret
-  monitor: 192.168.122.11:6789
+  csiProvisionerSecretNameSpace: default
 reclaimPolicy: Delete

deploy/cephfs/kubernetes/cephfsplugin.yaml

@@ -3,30 +3,39 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-nodeplugin
+  name: csi-cephfsplugin
 
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-nodeplugin
+  name: csi-cephfsplugin
 rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "update"]
+  - apiGroups: [""]
+    resources: ["namespaces"]
+    verbs: ["get", "list"]
+  - apiGroups: [""]
+    resources: ["persistentvolumes"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments"]
+    verbs: ["get", "list", "watch", "update"]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-nodeplugin
+  name: csi-cephfsplugin
 subjects:
   - kind: ServiceAccount
-    name: csi-nodeplugin
+    name: csi-cephfsplugin
     namespace: default
 roleRef:
   kind: ClusterRole
-  name: csi-nodeplugin
+  name: csi-cephfsplugin
-  apiGroup: rbac.authorization.k8s.io          
+  apiGroup: rbac.authorization.k8s.io
 
 ---
 # This YAML file contains driver-registrar & csi driver nodeplugin API objects,
@@ -35,17 +44,17 @@ roleRef:
 kind: DaemonSet
 apiVersion: apps/v1beta2
 metadata:
-  name: csi-nodeplugin-cephfsplugin
+  name: csi-cephfsplugin
 spec:
   selector:
     matchLabels:
-      app: csi-nodeplugin-cephfsplugin
+      app: csi-cephfsplugin
   template:
     metadata:
       labels:
-        app: csi-nodeplugin-cephfsplugin
+        app: csi-cephfsplugin
     spec:
-      serviceAccount: csi-nodeplugin
+      serviceAccount: csi-cephfsplugin
       hostNetwork: true
       containers:
         - name: driver-registrar
@@ -55,15 +64,15 @@ spec:
             - "--csi-address=$(ADDRESS)"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins/cephfsplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins/cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
-        - name: cephfsplugin 
+        - name: csi-cephfsplugin
           securityContext:
             privileged: true
             capabilities:
@@ -74,18 +83,18 @@ spec:
             - "--nodeid=$(NODE_ID)"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--v=5"
-            - "--drivername=cephfsplugin"
+            - "--drivername=csi-cephfsplugin"
           env:
             - name: NODE_ID
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
-              value: unix://var/lib/kubelet/plugins/cephfsplugin/csi.sock
+              value: unix://var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: plugin-dir
-              mountPath: /var/lib/kubelet/plugins/cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
             - name: pods-mount-dir
               mountPath: /var/lib/kubelet/pods
               mountPropagation: "Bidirectional"
@@ -94,12 +103,10 @@ spec:
             - mountPath: /lib/modules
               name: lib-modules
               readOnly: true
-            #- name: cephfs-config
-            #  mountPath: /etc/ceph
       volumes:
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin
             type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
@@ -107,7 +114,7 @@ spec:
             type: Directory
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin
             type: DirectoryOrCreate
         - name: host-sys
           hostPath:
@@ -115,6 +122,3 @@ spec:
         - name: lib-modules
           hostPath:
             path: /lib/modules
-        #- name: cephfs-config
-        #  hostPath:
-        #    path: /etc/ceph

deploy/cephfs/kubernetes/csi-attacher.yaml

@@ -12,6 +12,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: external-attacher-runner
 rules:
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["get", "list", "watch", "update"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
     verbs: ["get", "list", "watch", "update"]
@@ -72,13 +75,13 @@ spec:
             - "--csi-address=$(ADDRESS)"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins/cephfsplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins/cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin
             type: DirectoryOrCreate

deploy/cephfs/kubernetes/csi-provisioner.yaml

@@ -18,6 +18,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: external-provisioner-runner
 rules:
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
     verbs: ["get", "list", "watch", "create", "delete"]
@@ -77,18 +80,18 @@ spec:
         - name: csi-provisioner
           image: quay.io/k8scsi/csi-provisioner:v0.2.0
           args:
-            - "--provisioner=cephfsplugin"
+            - "--provisioner=csi-cephfsplugin"
             - "--csi-address=$(ADDRESS)"
             - "--v=5"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins/cephfsplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins/cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin
             type: DirectoryOrCreate

deploy/cephfs/kubernetes/pod.yaml

@@ -12,6 +12,6 @@ spec:
   volumes:
    - name: mypvc
      persistentVolumeClaim:
-       claimName: cephfs-pvc
+       claimName: csi-cephfs-pvc
        readOnly: false
 

deploy/cephfs/kubernetes/pvc.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: cephfs-pvc
+  name: csi-cephfs-pvc
 spec:
   accessModes:
   - ReadWriteMany
   resources:
     requests:
       storage: 5Gi
-  storageClassName: cephfs
+  storageClassName: csi-cephfs