From aed2235cdf7edc8e48157f8aff4871569b8bcffa Mon Sep 17 00:00:00 2001
From: Viktor Kuzmin <kvaster@gmail.com>
Date: Tue, 8 Aug 2023 10:05:04 +0300
Subject: Refactor options to be backward compatible, fixes #133

---
 deploy/helm/seaweedfs-csi-driver/Chart.yaml                | 2 +-
 deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml  | 2 +-
 deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'deploy')

diff --git a/deploy/helm/seaweedfs-csi-driver/Chart.yaml b/deploy/helm/seaweedfs-csi-driver/Chart.yaml
index f60c6e3..9d01d29 100644
--- a/deploy/helm/seaweedfs-csi-driver/Chart.yaml
+++ b/deploy/helm/seaweedfs-csi-driver/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: seaweedfs-csi-driver
 description: A Helm chart for Kubernetes CSI backed by a SeaweedFS cluster
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: latest
diff --git a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml
index 23738d2..e71b4df 100644
--- a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml
+++ b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml
@@ -45,7 +45,7 @@ spec:
             {{- if .Values.node.injectTopologyInfoFromNodeLabel.enabled }}
             - --dataCenter=$(DATACENTER)
             {{- end }}
-            - --node
+            - --components=node
           env:
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
diff --git a/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml b/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml
index 846a92a..96cd561 100644
--- a/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml
+++ b/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml
@@ -44,10 +44,8 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --filer=$(SEAWEEDFS_FILER)
             - --nodeid=$(NODE_ID)"
-            - --controller
-            {{- if .Values.csiAttacher.enabled }}
-            - --attacher
-            {{- end }}
+            - --components=controller
+            - --attacher={{ .Values.csiAttacher.enabled }}
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
-- 
cgit v1.2.3


From 4ff5838eb9fdf4f10a77f54ae4fdb8f274be7341 Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Fri, 20 Oct 2023 10:55:27 +0800
Subject: Feat: add driver name support

---
 deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml  | 3 +++
 deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml | 5 ++++-
 deploy/helm/seaweedfs-csi-driver/values.yaml               | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'deploy')

diff --git a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml
index e71b4df..4a4a421 100644
--- a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml
+++ b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml
@@ -40,6 +40,7 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --filer=$(SEAWEEDFS_FILER)
             - --nodeid=$(NODE_ID)
+            - --driverName=$(DRIVER_NAME)
             - --cacheDir=/var/cache/seaweedfs
             - --dataLocality={{ .Values.dataLocality }}
             {{- if .Values.node.injectTopologyInfoFromNodeLabel.enabled }}
@@ -55,6 +56,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: DRIVER_NAME
+              value: {{ .Values.driverName | quote }}
             {{- if .Values.node.injectTopologyInfoFromNodeLabel.enabled }}
             - name: DATACENTER
               valueFrom:
diff --git a/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml b/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml
index 96cd561..edbc143 100644
--- a/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml
+++ b/deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml
@@ -43,7 +43,8 @@ spec:
           args :
             - --endpoint=$(CSI_ENDPOINT)
             - --filer=$(SEAWEEDFS_FILER)
-            - --nodeid=$(NODE_ID)"
+            - --nodeid=$(NODE_ID)
+            - --driverName=$(DRIVER_NAME)
             - --components=controller
             - --attacher={{ .Values.csiAttacher.enabled }}
           env:
@@ -55,6 +56,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: DRIVER_NAME
+              value: {{ .Values.driverName | quote }}
             {{- if .Values.tlsSecret }}
             - name: WEED_GRPC_CLIENT_KEY
               value: /var/run/secrets/app/tls/tls.key
diff --git a/deploy/helm/seaweedfs-csi-driver/values.yaml b/deploy/helm/seaweedfs-csi-driver/values.yaml
index ac25b0c..1689186 100644
--- a/deploy/helm/seaweedfs-csi-driver/values.yaml
+++ b/deploy/helm/seaweedfs-csi-driver/values.yaml
@@ -67,7 +67,6 @@ seaweedfsCsiPlugin:
       add: ["SYS_ADMIN"]
     allowPrivilegeEscalation: true
 
-# DO NOT Change. Reserved for future releases. Must be equal Name in GetPluginInfoResponse
 driverName: seaweedfs-csi-driver
 
 controller:
-- 
cgit v1.2.3