From 49d7c3a4883eed724ba22908fbe0e86deee8c7a4 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Tue, 27 Jul 2021 13:05:32 +0300
Subject: [PATCH] Rename CSI driver to ru.yandex.s3.csi

---
 README.md                                    | 2 +-
 deploy/kubernetes/attacher.yaml              | 6 +++---
 deploy/kubernetes/csi-s3.yaml                | 4 ++--
 deploy/kubernetes/examples/pvc-manual.yaml   | 2 +-
 deploy/kubernetes/examples/storageclass.yaml | 2 +-
 deploy/kubernetes/provisioner.yaml           | 8 ++++----
 pkg/driver/driver.go                         | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 8a1db12..5d49afa 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: csi-s3-existing-bucket
-provisioner: ch.ctrox.csi.s3-driver
+provisioner: ru.yandex.s3.csi
 parameters:
   mounter: rclone
   bucket: some-existing-bucket-name
diff --git a/deploy/kubernetes/attacher.yaml b/deploy/kubernetes/attacher.yaml
index e587d21..c18ddc6 100644
--- a/deploy/kubernetes/attacher.yaml
+++ b/deploy/kubernetes/attacher.yaml
@@ -81,13 +81,13 @@ spec:
             - "--csi-address=$(ADDRESS)"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver/csi.sock
+              value: /var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver
+              mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi
       volumes:
         - name: socket-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver
+            path: /var/lib/kubelet/plugins/ru.yandex.s3.csi
             type: DirectoryOrCreate
diff --git a/deploy/kubernetes/csi-s3.yaml b/deploy/kubernetes/csi-s3.yaml
index 55ca9e4..cbd8d02 100644
--- a/deploy/kubernetes/csi-s3.yaml
+++ b/deploy/kubernetes/csi-s3.yaml
@@ -65,7 +65,7 @@ spec:
             - name: ADDRESS
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver/csi.sock
+              value: /var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -109,7 +109,7 @@ spec:
             type: DirectoryOrCreate
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver
+            path: /var/lib/kubelet/plugins/ru.yandex.s3.csi
             type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
diff --git a/deploy/kubernetes/examples/pvc-manual.yaml b/deploy/kubernetes/examples/pvc-manual.yaml
index 2265642..e5a82c1 100644
--- a/deploy/kubernetes/examples/pvc-manual.yaml
+++ b/deploy/kubernetes/examples/pvc-manual.yaml
@@ -16,7 +16,7 @@ spec:
     namespace: default
     name: manualclaim
   csi:
-    driver: ch.ctrox.csi.s3-driver
+    driver: ru.yandex.s3.csi
     controllerPublishSecretRef:
       name: csi-s3-secret
       namespace: kube-system
diff --git a/deploy/kubernetes/examples/storageclass.yaml b/deploy/kubernetes/examples/storageclass.yaml
index 7b54e6f..ea45707 100644
--- a/deploy/kubernetes/examples/storageclass.yaml
+++ b/deploy/kubernetes/examples/storageclass.yaml
@@ -3,7 +3,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: csi-s3
-provisioner: ch.ctrox.csi.s3-driver
+provisioner: ru.yandex.s3.csi
 parameters:
   mounter: geesefs
   # you can set mount options here, for example limit memory cache size (recommended)
diff --git a/deploy/kubernetes/provisioner.yaml b/deploy/kubernetes/provisioner.yaml
index 441a425..0e216a2 100644
--- a/deploy/kubernetes/provisioner.yaml
+++ b/deploy/kubernetes/provisioner.yaml
@@ -80,11 +80,11 @@ spec:
             - "--v=4"
           env:
             - name: ADDRESS
-              value: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver/csi.sock
+              value: /var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver
+              mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi
         - name: csi-s3
           image: csi-s3
           imagePullPolicy: IfNotPresent
@@ -94,14 +94,14 @@ spec:
             - "--v=4"
           env:
             - name: CSI_ENDPOINT
-              value: unix:///var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver/csi.sock
+              value: unix:///var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock
             - name: NODE_ID
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
             - name: socket-dir
-              mountPath: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver
+              mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi
       volumes:
         - name: socket-dir
           emptyDir: {}
diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
index e3c0f8d..5553da1 100644
--- a/pkg/driver/driver.go
+++ b/pkg/driver/driver.go
@@ -33,8 +33,8 @@ type driver struct {
 }
 
 var (
-	vendorVersion = "v1.2.0-rc.1"
-	driverName    = "ch.ctrox.csi.s3-driver"
+	vendorVersion = "v1.2.0"
+	driverName    = "ru.yandex.s3.csi"
 )
 
 // New initializes the driver