From ac5bff51be0974136800c72a4ee44dd59ac5a495 Mon Sep 17 00:00:00 2001
From: Arthur Chaloin <arthur@achaloin.com>
Date: Tue, 28 Jan 2020 17:56:52 +0100
Subject: [PATCH] fix(deploy): consistent plugin name accross configs

---
 deploy/daemonset.yml     | 66 +++++++++++++++++++++-------------------
 example/storageclass.yml |  2 +-
 pkg/common/driver.go     |  2 +-
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/deploy/daemonset.yml b/deploy/daemonset.yml
index 86ede8d0..1702c78e 100644
--- a/deploy/daemonset.yml
+++ b/deploy/daemonset.yml
@@ -5,7 +5,7 @@ metadata:
   name: dothill-node
 
 spec:
-	selector:
+  selector:
     matchLabels:
       name: dothill-node
   template:
@@ -13,33 +13,37 @@ spec:
       labels:
         name: dothill-node
     spec:
-			containers:
-				- name: csi-driver-registrar
-					image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
-					args:
-						- "--csi-address=/csi/csi.sock"
-						- "--kubelet-registration-path=/var/lib/kubelet/plugins/dothill.csi.enix.io/csi.sock"
-					lifecycle:
-						preStop:
-							exec:
-								command: ["/bin/sh", "-c", "rm -rf /registration/dothill.csi.enix.io /registration/dothill.csi.enix.io-reg.sock"]
-					volumeMounts:
-						- name: plugin-dir
-							mountPath: /csi
-						- name: registration-dir
-							mountPath: /registration
-				- name: dothill-node
-					image: docker-registry.enix.io/enix/dothill-provisioner:beta
-					command: /dothill-node -bind=/csi/csi.sock
-					volumeMounts:
-						- name: plugin-dir
-							mountPath: /csi
-			volumes:
-				- name: registration-dir
-					hostPath:
-						path: /var/lib/kubelet/plugins_registry/
-						type: Directory
-				- name: plugin-dir
-					hostPath:
-						path: /var/lib/kubelet/plugins/dothill.csi.enix.io/
-						type: DirectoryOrCreate
+      imagePullSecrets:
+        - name: regcred
+      containers:
+        - name: csi-driver-registrar
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
+          args:
+            - "--csi-address=/csi/csi.sock"
+            - "--kubelet-registration-path=/var/lib/kubelet/plugins/io.enix.csi.dothill/csi.sock"
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/bin/sh", "-c", "rm -rf /registration/io.enix.csi.dothill /registration/io.enix.csi.dothill-reg.sock"]
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
+            - name: registration-dir
+              mountPath: /registration
+        - name: dothill-node
+          image: docker-registry.enix.io/enix/dothill-provisioner:rc
+          command:
+            - dothill-node
+            - -bind=unix:///csi/csi.sock
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
+      volumes:
+        - name: registration-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins_registry/
+            type: Directory
+        - name: plugin-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins/io.enix.csi.dothill/
+            type: DirectoryOrCreate
diff --git a/example/storageclass.yml b/example/storageclass.yml
index 326f26e0..4075b08c 100644
--- a/example/storageclass.yml
+++ b/example/storageclass.yml
@@ -3,7 +3,7 @@ kind: StorageClass
 metadata:
   name: dothill-storage
 
-provisioner: dothill
+provisioner: io.enix.csi.dothill
 parameters:
   csi.storage.k8s.io/provisioner-secret-name: dothill-credentials
   csi.storage.k8s.io/provisioner-secret-namespace: kube-system
diff --git a/pkg/common/driver.go b/pkg/common/driver.go
index c16beec5..c4ff50f5 100644
--- a/pkg/common/driver.go
+++ b/pkg/common/driver.go
@@ -10,7 +10,7 @@ import (
 )
 
 // PluginName is the public name to be used in storage class etc.
-const PluginName = "dothill"
+const PluginName = "io.enix.csi.dothill"
 
 // Driver contains main resources needed by the driver
 // and references the underlying specific driver