diff options
| -rw-r--r-- | cmd/seaweedfs-csi-driver/main.go | 3 | ||||
| -rw-r--r-- | deploy/helm/seaweedfs-csi-driver/templates/daemonset.yaml | 3 | ||||
| -rw-r--r-- | deploy/helm/seaweedfs-csi-driver/templates/deployment.yaml | 5 | ||||
| -rw-r--r-- | deploy/helm/seaweedfs-csi-driver/values.yaml | 1 | ||||
| -rw-r--r-- | pkg/driver/driver.go | 10 |
5 files changed, 12 insertions, 10 deletions
diff --git a/cmd/seaweedfs-csi-driver/main.go b/cmd/seaweedfs-csi-driver/main.go index 7ace8a1..f749db6 100644 --- a/cmd/seaweedfs-csi-driver/main.go +++ b/cmd/seaweedfs-csi-driver/main.go @@ -15,6 +15,7 @@ import ( var ( components = flag.String("components", "controller,node", "components to run, by default both controller and node") enableAttacher = flag.Bool("attacher", true, "enable attacher, by default enabled for backward compatibility") + driverName = flag.String("driverName", "seaweedfs-csi-driver", "CSI driver name, used by CSIDriver and StorageClass") filer = flag.String("filer", "localhost:8888", "filer server") endpoint = flag.String("endpoint", "unix://tmp/seaweedfs-csi.sock", "CSI endpoint to accept gRPC calls") @@ -77,7 +78,7 @@ func main() { glog.Infof("connect to filer %s", *filer) - drv := driver.NewSeaweedFsDriver(*filer, *nodeID, *endpoint, *enableAttacher) + drv := driver.NewSeaweedFsDriver(*driverName, *filer, *nodeID, *endpoint, *enableAttacher) drv.RunNode = runNode drv.RunController = runController 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: diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go index 797bf3e..4e09a93 100644 --- a/pkg/driver/driver.go +++ b/pkg/driver/driver.go @@ -18,10 +18,6 @@ import ( "google.golang.org/grpc/status" ) -const ( - driverName = "seaweedfs-csi-driver" -) - var ( version = "1.0.0" ) @@ -52,16 +48,16 @@ type SeaweedFsDriver struct { RunController bool } -func NewSeaweedFsDriver(filer, nodeID, endpoint string, enableAttacher bool) *SeaweedFsDriver { +func NewSeaweedFsDriver(name, filer, nodeID, endpoint string, enableAttacher bool) *SeaweedFsDriver { - glog.Infof("Driver: %v version: %v", driverName, version) + glog.Infof("Driver: %v version: %v", name, version) util.LoadConfiguration("security", false) n := &SeaweedFsDriver{ endpoint: endpoint, nodeID: nodeID, - name: driverName, + name: name, version: version, filers: pb.ServerAddresses(filer).ToAddresses(), grpcDialOption: security.LoadClientTLS(util.GetViper(), "grpc.client"), |