From 848d87453f7ac68e9d7b48b092899a2873ebad44 Mon Sep 17 00:00:00 2001
From: Mehran Kholdi <semekh@hamravesh.com>
Date: Sat, 15 Aug 2020 01:24:55 +0430
Subject: [PATCH] Change default provisioner name from `rawfile.hamravesh.com`
 to `rawfile.csi.openebs.io`

---
 .ci/e2e-test/rawfile-driver.yaml                             | 2 +-
 README.md                                                    | 2 +-
 consts.py                                                    | 5 ++++-
 deploy/charts/rawfile-csi/Chart.yaml                         | 2 +-
 deploy/charts/rawfile-csi/templates/00-driver.yaml           | 2 +-
 .../charts/rawfile-csi/templates/01-controller-plugin.yaml   | 2 ++
 deploy/charts/rawfile-csi/templates/01-node-plugin.yaml      | 2 ++
 deploy/charts/rawfile-csi/values.yaml                        | 4 +++-
 rawfile_servicer.py                                          | 4 ++--
 9 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.ci/e2e-test/rawfile-driver.yaml b/.ci/e2e-test/rawfile-driver.yaml
index e630f4e..8397d59 100644
--- a/.ci/e2e-test/rawfile-driver.yaml
+++ b/.ci/e2e-test/rawfile-driver.yaml
@@ -3,7 +3,7 @@ StorageClass:
 SnapshotClass:
   FromName: true
 DriverInfo:
-  Name: rawfile.hamravesh.com
+  Name: rawfile.csi.openebs.io
   SupportedFsType:
     ext4:
     btrfs:
diff --git a/README.md b/README.md
index d3902f9..681fa3d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: my-sc
-provisioner: rawfile.hamravesh.com
+provisioner: rawfile.csi.openebs.io
 reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
 allowVolumeExpansion: true
diff --git a/consts.py b/consts.py
index 0972568..ae2ff88 100644
--- a/consts.py
+++ b/consts.py
@@ -1,3 +1,6 @@
-PROVISIONER_VERSION = "0.3.0"
+import os
+
+PROVISIONER_NAME = os.getenv("PROVISIONER_NAME", "rawfile.csi.openebs.io")
+PROVISIONER_VERSION = "0.4.0"
 DATA_DIR = "/data"
 CONFIG = {}
diff --git a/deploy/charts/rawfile-csi/Chart.yaml b/deploy/charts/rawfile-csi/Chart.yaml
index 783ad76..54903fd 100644
--- a/deploy/charts/rawfile-csi/Chart.yaml
+++ b/deploy/charts/rawfile-csi/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: rawfile-csi
 description: RawFile Driver Container Storage Interface
 type: application
-version: 0.3.0
+version: 0.4.0
diff --git a/deploy/charts/rawfile-csi/templates/00-driver.yaml b/deploy/charts/rawfile-csi/templates/00-driver.yaml
index b24df60..880c8ca 100644
--- a/deploy/charts/rawfile-csi/templates/00-driver.yaml
+++ b/deploy/charts/rawfile-csi/templates/00-driver.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: CSIDriver
 metadata:
-  name: rawfile.hamravesh.com
+  name: {{ .Values.provisionerName }}
 spec:
   attachRequired: false
   podInfoOnMount: true
diff --git a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
index 2026c36..a524571 100644
--- a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
+++ b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
@@ -42,6 +42,8 @@ spec:
           image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
           env:
+            - name: PROVISIONER_NAME
+              value: "{{ .Values.provisionerName }}"
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
             - name: IMAGE_REPOSITORY
diff --git a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
index a3bf569..bd8619e 100644
--- a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
+++ b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
@@ -60,6 +60,8 @@ spec:
           securityContext:
             privileged: true
           env:
+            - name: PROVISIONER_NAME
+              value: "{{ .Values.provisionerName }}"
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
             - name: IMAGE_REPOSITORY
diff --git a/deploy/charts/rawfile-csi/values.yaml b/deploy/charts/rawfile-csi/values.yaml
index d811719..7abb492 100644
--- a/deploy/charts/rawfile-csi/values.yaml
+++ b/deploy/charts/rawfile-csi/values.yaml
@@ -1,7 +1,9 @@
+provisionerName: "rawfile.csi.openebs.io"
+
 defaults: &defaults
   image:
     repository: docker.io/openebs/rawfile-localpv
-    tag: 0.3.0
+    tag: 0.4.0
     pullPolicy: Always
   resources:
     limits:
diff --git a/rawfile_servicer.py b/rawfile_servicer.py
index 21a20c2..84d2df1 100644
--- a/rawfile_servicer.py
+++ b/rawfile_servicer.py
@@ -4,7 +4,7 @@ import grpc
 from google.protobuf.wrappers_pb2 import BoolValue
 
 import rawfile_util
-from consts import PROVISIONER_VERSION
+from consts import PROVISIONER_VERSION, PROVISIONER_NAME
 from csi import csi_pb2, csi_pb2_grpc
 from declarative import be_mounted, be_unmounted, be_symlink, be_absent
 from metrics import volume_stats
@@ -20,7 +20,7 @@ class RawFileIdentityServicer(csi_pb2_grpc.IdentityServicer):
     @log_grpc_request
     def GetPluginInfo(self, request, context):
         return csi_pb2.GetPluginInfoResponse(
-            name="rawfile.hamravesh.com", vendor_version=PROVISIONER_VERSION
+            name=PROVISIONER_NAME, vendor_version=PROVISIONER_VERSION
         )
 
     @log_grpc_request