switch to node registrar

deploy/cephfs/kubernetes/csi-cephfsplugin-attacher.yaml

@@ -33,13 +33,13 @@ spec:
             - "--csi-address=$(ADDRESS)"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins_registry/csi-cephfsplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin
             type: DirectoryOrCreate

deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml

@@ -34,13 +34,13 @@ spec:
             - "--v=5"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins_registry/csi-cephfsplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin
             type: DirectoryOrCreate

deploy/cephfs/kubernetes/csi-cephfsplugin.yaml

@@ -18,23 +18,23 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet      
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:canary
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
           args:
             - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/csi/csi.sock"
-            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+            - "--kubelet-registration-path=/var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock"
+          lifecycle:
+            preStop:
+              exec:
+                  command: ["/bin/sh", "-c", "rm -rf /registration/csi-cephfsplugin /registration/csi-cephfsplugin-reg.sock"]          
           env:
-            - name: ADDRESS
-              value: /var/lib/kubelet/plugins_registry/csi-cephfsplugin/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins_registry/csi-cephfsplugin/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
-            - name: socket-dir
+            - name: plugin-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+              mountPath: /csi
             - name: registration-dir
               mountPath: /registration
         - name: csi-cephfsplugin
@@ -60,11 +60,11 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CSI_ENDPOINT
-              value: unix://var/lib/kubelet/plugins_registry/csi-cephfsplugin/csi.sock
+              value: unix://var/lib/kubelet/plugins/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: plugin-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+              mountPath: /var/lib/kubelet/plugins/csi-cephfsplugin
             - name: csi-plugins-dir
               mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi
               mountPropagation: "Bidirectional"
@@ -81,7 +81,7 @@ spec:
       volumes:
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
+            path: /var/lib/kubelet/plugins/csi-cephfsplugin/
             type: DirectoryOrCreate
         - name: csi-plugins-dir
           hostPath:
@@ -95,10 +95,6 @@ spec:
           hostPath:
             path: /var/lib/kubelet/pods
             type: Directory
-        - name: socket-dir
-          hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-cephfsplugin
-            type: DirectoryOrCreate
         - name: host-sys
           hostPath:
             path: /sys

deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml

@@ -33,13 +33,13 @@ spec:
             - "--csi-address=$(ADDRESS)"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins_registry/csi-rbdplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-rbdplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+              mountPath: /var/lib/kubelet/plugins/csi-rbdplugin
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+            path: /var/lib/kubelet/plugins/csi-rbdplugin
             type: DirectoryOrCreate

deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml

@@ -33,13 +33,13 @@ spec:
             - "--v=5"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins_registry/csi-rbdplugin/csi.sock
+              value: /var/lib/kubelet/plugins/csi-rbdplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+              mountPath: /var/lib/kubelet/plugins/csi-rbdplugin
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+            path: /var/lib/kubelet/plugins/csi-rbdplugin
             type: DirectoryOrCreate

deploy/rbd/kubernetes/csi-rbdplugin.yaml

@@ -19,23 +19,23 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet      
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:canary
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
           args:
             - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/csi/csi.sock"
-            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+            - "--kubelet-registration-path=/var/lib/kubelet/plugins/csi-rbdplugin/csi.sock"
+          lifecycle:
+            preStop:
+              exec:
+                  command: ["/bin/sh", "-c", "rm -rf /registration/csi-rbdplugin /registration/csi-rbdplugin-reg.sock"]          
           env:
-            - name: ADDRESS
-              value: /var/lib/kubelet/plugins_registry/csi-rbdplugin/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins_registry/csi-rbdplugin/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
-            - name: socket-dir
+            - name: plugin-dir
-              mountPath: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+              mountPath: /csi
             - name: registration-dir
               mountPath: /registration
         - name: csi-rbdplugin
@@ -87,7 +87,7 @@ spec:
       volumes:
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+            path: /var/lib/kubelet/plugins/csi-rbdplugin
             type: DirectoryOrCreate
         - name: plugin-mount-dir
           hostPath: 
@@ -101,10 +101,6 @@ spec:
           hostPath:
             path: /var/lib/kubelet/pods
             type: Directory
-        - name: socket-dir
-          hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi-rbdplugin
-            type: DirectoryOrCreate
         - name: host-dev
           hostPath:
             path: /dev

pkg/cephfs/driver.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	PluginFolder = "/var/lib/kubelet/plugins_registry/csi-cephfsplugin"
+	PluginFolder = "/var/lib/kubelet/plugins/csi-cephfsplugin"
 	Version      = "1.0.0"
 )
 

pkg/cephfs/nodeserver.go

@@ -241,3 +241,7 @@ func (ns *nodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetC
 		},
 	}, nil
 }
+
+func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
+	return ns.DefaultNodeServer.NodeGetInfo(ctx, req)
+}

pkg/rbd/nodeserver.go

@@ -218,6 +218,10 @@ func (ns *nodeServer) NodeUnstageVolume(
 	return nil, status.Error(codes.Unimplemented, "")
 }
 
+func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
+	return ns.DefaultNodeServer.NodeGetInfo(ctx, req)
+}
+
 func resolveBindMountedBlockDevice(mountPath string) (string, error) {
 	cmd := exec.Command("findmnt", "-n", "-o", "SOURCE", "--first-only", "--target", mountPath)
 	out, err := cmd.CombinedOutput()

pkg/rbd/rbd.go

@@ -30,7 +30,7 @@ import (
 
 // PluginFolder defines the location of rbdplugin
 const (
-	PluginFolder      = "/var/lib/kubelet/plugins_registry/csi-rbdplugin"
+	PluginFolder      = "/var/lib/kubelet/plugins/csi-rbdplugin"
 	rbdDefaultAdminId = "admin"
 	rbdDefaultUserId  = rbdDefaultAdminId
 )