From 4274180f3d180e079987ac754b22f30ae28df39e Mon Sep 17 00:00:00 2001 From: Daniel Santos Date: Wed, 20 Jan 2021 13:58:29 -0700 Subject: [PATCH 1/9] Add mount arguments as CSI volume parameters --- pkg/driver/mounter.go | 7 ++++--- pkg/driver/mounter_seaweedfs.go | 22 +++++++++++++++++----- pkg/driver/nodeserver.go | 6 ++++-- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pkg/driver/mounter.go b/pkg/driver/mounter.go index 9aaa84a..389cbc9 100644 --- a/pkg/driver/mounter.go +++ b/pkg/driver/mounter.go @@ -4,8 +4,9 @@ import ( "fmt" "time" - "github.com/chrislusf/seaweedfs/weed/glog" "os/exec" + + "github.com/chrislusf/seaweedfs/weed/glog" "k8s.io/utils/mount" ) @@ -19,8 +20,8 @@ type Mounter interface { Mount(target string) error } -func newMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) { - return newSeaweedFsMounter(bucketName, driver) +func newMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) { + return newSeaweedFsMounter(bucketName, driver, volParameters) } func fuseMount(path string, command string, args []string) error { diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go index d93e736..b61776b 100644 --- a/pkg/driver/mounter_seaweedfs.go +++ b/pkg/driver/mounter_seaweedfs.go @@ -8,18 +8,20 @@ import ( // Implements Mounter type seaweedFsMounter struct { - bucketName string - driver *SeaweedFsDriver + bucketName string + driver *SeaweedFsDriver + volParameters map[string]string } const ( seaweedFsCmd = "weed" ) -func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) { +func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) { return &seaweedFsMounter{ - bucketName: bucketName, - driver: driver, + bucketName: bucketName, + driver: driver, + volParameters: volParameters, }, nil } @@ -35,6 +37,16 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) error { fmt.Sprintf("-filer=%s", seaweedFs.driver.filer), fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName), } + + for arg, value := range seaweedFs.volParameters { + switch arg { + case "map.uid": + args = append(args, fmt.Sprintf("-map.uid=%s", value)) + case "map.gid": + args = append(args, fmt.Sprintf("-map.gid=%s", value)) + } + } + if seaweedFs.driver.ConcurrentWriters > 0 { args = append(args, fmt.Sprintf("-concurrentWriters=%d", seaweedFs.driver.ConcurrentWriters)) } diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go index 0509f79..52f0835 100644 --- a/pkg/driver/nodeserver.go +++ b/pkg/driver/nodeserver.go @@ -55,7 +55,9 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis mo = append(mo, "ro") } - mounter, err := newMounter(volumeID, ns.Driver) + volParameters := req.GetVolumeContext() + + mounter, err := newMounter(volumeID, ns.Driver, volParameters) if err != nil { return nil, err } @@ -163,4 +165,4 @@ func checkMount(targetPath string) (bool, error) { } } return notMnt, nil -} \ No newline at end of file +} From 9e3c2ce6e29f19dad8b383a03b25698b19657c76 Mon Sep 17 00:00:00 2001 From: Daniel Santos Date: Wed, 20 Jan 2021 15:40:34 -0700 Subject: [PATCH 2/9] Use PublishContext instead --- pkg/driver/mounter_seaweedfs.go | 2 +- pkg/driver/nodeserver.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go index b61776b..e89b202 100644 --- a/pkg/driver/mounter_seaweedfs.go +++ b/pkg/driver/mounter_seaweedfs.go @@ -26,7 +26,7 @@ func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volParamete } func (seaweedFs *seaweedFsMounter) Mount(target string) error { - glog.V(0).Infof("mounting %s%s to %s", seaweedFs.driver.filer, seaweedFs.bucketName, target) + glog.V(0).Infof("mounting %s %s to %s", seaweedFs.driver.filer, seaweedFs.bucketName, target) args := []string{ "mount", diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go index 52f0835..e87ac90 100644 --- a/pkg/driver/nodeserver.go +++ b/pkg/driver/nodeserver.go @@ -55,7 +55,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis mo = append(mo, "ro") } - volParameters := req.GetVolumeContext() + volParameters := req.GetPublishContext() mounter, err := newMounter(volumeID, ns.Driver, volParameters) if err != nil { From d0d7f1ee3d02343503c16b782d6d54b278c18df3 Mon Sep 17 00:00:00 2001 From: Daniel Santos Date: Wed, 20 Jan 2021 15:42:56 -0700 Subject: [PATCH 3/9] Troubleshooting --- pkg/driver/nodeserver.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go index e87ac90..a80a7fd 100644 --- a/pkg/driver/nodeserver.go +++ b/pkg/driver/nodeserver.go @@ -57,6 +57,8 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis volParameters := req.GetPublishContext() + glog.V(0).Infof("Parameters: %s", volParameters) + mounter, err := newMounter(volumeID, ns.Driver, volParameters) if err != nil { return nil, err From 78445097900a796b6ced7be57d600e2b5f0cf9d6 Mon Sep 17 00:00:00 2001 From: Daniel Santos Date: Wed, 20 Jan 2021 15:55:38 -0700 Subject: [PATCH 4/9] Use VolumeContext --- pkg/driver/nodeserver.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go index a80a7fd..52f0835 100644 --- a/pkg/driver/nodeserver.go +++ b/pkg/driver/nodeserver.go @@ -55,9 +55,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis mo = append(mo, "ro") } - volParameters := req.GetPublishContext() - - glog.V(0).Infof("Parameters: %s", volParameters) + volParameters := req.GetVolumeContext() mounter, err := newMounter(volumeID, ns.Driver, volParameters) if err != nil { From ca767fdce1caa6e25d68979266f4c065051f5912 Mon Sep 17 00:00:00 2001 From: Daniel Santos Date: Wed, 27 Jan 2021 21:12:13 -0700 Subject: [PATCH 5/9] Match variable names to Context instead of Parameters --- pkg/driver/mounter.go | 4 ++-- pkg/driver/mounter_seaweedfs.go | 16 ++++++++-------- pkg/driver/nodeserver.go | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/driver/mounter.go b/pkg/driver/mounter.go index 389cbc9..5085b49 100644 --- a/pkg/driver/mounter.go +++ b/pkg/driver/mounter.go @@ -20,8 +20,8 @@ type Mounter interface { Mount(target string) error } -func newMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) { - return newSeaweedFsMounter(bucketName, driver, volParameters) +func newMounter(bucketName string, driver *SeaweedFsDriver, volContext map[string]string) (Mounter, error) { + return newSeaweedFsMounter(bucketName, driver, volContext) } func fuseMount(path string, command string, args []string) error { diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go index e89b202..9d34b5d 100644 --- a/pkg/driver/mounter_seaweedfs.go +++ b/pkg/driver/mounter_seaweedfs.go @@ -8,20 +8,20 @@ import ( // Implements Mounter type seaweedFsMounter struct { - bucketName string - driver *SeaweedFsDriver - volParameters map[string]string + bucketName string + driver *SeaweedFsDriver + volContext map[string]string } const ( seaweedFsCmd = "weed" ) -func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) { +func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volContext map[string]string) (Mounter, error) { return &seaweedFsMounter{ - bucketName: bucketName, - driver: driver, - volParameters: volParameters, + bucketName: bucketName, + driver: driver, + volContext: volContext, }, nil } @@ -38,7 +38,7 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) error { fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName), } - for arg, value := range seaweedFs.volParameters { + for arg, value := range seaweedFs.volContext { switch arg { case "map.uid": args = append(args, fmt.Sprintf("-map.uid=%s", value)) diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go index 52f0835..71f40ba 100644 --- a/pkg/driver/nodeserver.go +++ b/pkg/driver/nodeserver.go @@ -55,9 +55,9 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis mo = append(mo, "ro") } - volParameters := req.GetVolumeContext() + volContext := req.GetVolumeContext() - mounter, err := newMounter(volumeID, ns.Driver, volParameters) + mounter, err := newMounter(volumeID, ns.Driver, volContext) if err != nil { return nil, err } From e5bc351871e6447f0b54e79e4b0356d3aed57bed Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 8 Feb 2021 02:42:58 -0800 Subject: [PATCH 6/9] Update go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index aee0fdc..dbf4da7 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( go.etcd.io/etcd v3.3.25+incompatible // indirect go.mongodb.org/mongo-driver v1.4.2 // indirect go.opencensus.io v0.22.5 // indirect - go.uber.org/multierr v1.6.0 // indirect + go.uber.org/multierr v1.6.1 // indirect go.uber.org/zap v1.16.0 // indirect gocloud.dev/pubsub/natspubsub v0.20.0 // indirect gocloud.dev/pubsub/rabbitpubsub v0.20.0 // indirect From cb9fd37bafa4211e2d43d09c83356ee2a860ed28 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 16 Feb 2021 15:22:02 -0800 Subject: [PATCH 7/9] adjust --- README.md | 5 +++-- deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml | 2 +- deploy/helm/seaweedfs-csi-driver/templates/statefulset.yml | 2 +- deploy/helm/seaweedfs-csi-driver/values.yaml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3c25605..fc7b268 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,8 @@ $ kubectl delete -f deploy/kubernetes/sample-busybox-pod.yaml $ kubectl delete -f deploy/kubernetes/sample-seaweedfs-pvc.yaml $ kubectl delete -f deploy/kubernetes/seaweedfs-csi.yaml ``` -## Install by helm chart + +# Deployment by helm chart 1. Clone project ```bash @@ -53,7 +54,7 @@ git clone https://github.com/seaweedfs/seaweedfs-csi-driver.git ``` 2. Install ```bash -helm install --set seaweedfsFiller= seaweedfs-csi-driver ./seaweedfs-csi-driver/deploy/helm/seaweedfs-csi-driver +helm install --set seaweedfsFiler= seaweedfs-csi-driver ./seaweedfs-csi-driver/deploy/helm/seaweedfs-csi-driver ``` 3. Clean up diff --git a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml index aa887c2..d6a2114 100644 --- a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml +++ b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml @@ -61,7 +61,7 @@ spec: - name: CSI_ENDPOINT value: unix:///csi/csi.sock - name: SEAWEEDFS_FILER - value: {{ .Values.seaweedfsFiller | quote }} + value: {{ .Values.seaweedfsFiler | quote }} - name: NODE_ID valueFrom: fieldRef: diff --git a/deploy/helm/seaweedfs-csi-driver/templates/statefulset.yml b/deploy/helm/seaweedfs-csi-driver/templates/statefulset.yml index afdef7d..665c36b 100644 --- a/deploy/helm/seaweedfs-csi-driver/templates/statefulset.yml +++ b/deploy/helm/seaweedfs-csi-driver/templates/statefulset.yml @@ -63,7 +63,7 @@ spec: - name: CSI_ENDPOINT value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock - name: SEAWEEDFS_FILER - value: {{ .Values.seaweedfsFiller | quote }} + value: {{ .Values.seaweedfsFiler | quote }} - name: NODE_ID valueFrom: fieldRef: diff --git a/deploy/helm/seaweedfs-csi-driver/values.yaml b/deploy/helm/seaweedfs-csi-driver/values.yaml index f594151..e0c1a87 100644 --- a/deploy/helm/seaweedfs-csi-driver/values.yaml +++ b/deploy/helm/seaweedfs-csi-driver/values.yaml @@ -1,6 +1,6 @@ # host and port of your SeaweedFs filer -seaweedfsFiller: "" +seaweedfsFiler: "" storageClassName: seaweedfs-storage isDefaultStorageClass: false tlsSecret: "" From 56d1995f29cbc1c6d8acd0d953915a36590f4875 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 17 Feb 2021 00:54:46 -0800 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc7b268..f48d255 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ git clone https://github.com/seaweedfs/seaweedfs-csi-driver.git ``` 2. Install ```bash -helm install --set seaweedfsFiler= seaweedfs-csi-driver ./seaweedfs-csi-driver/deploy/helm/seaweedfs-csi-driver +helm install --set seaweedfsFiler= seaweedfs-csi-driver ./seaweedfs-csi-driver/deploy/helm/seaweedfs-csi-driver ``` 3. Clean up From bf92f0a08645193fbdbb30fac41341fa6dde608b Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 17 Feb 2021 01:09:41 -0800 Subject: [PATCH 9/9] fix build error --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index dbf4da7..aee0fdc 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( go.etcd.io/etcd v3.3.25+incompatible // indirect go.mongodb.org/mongo-driver v1.4.2 // indirect go.opencensus.io v0.22.5 // indirect - go.uber.org/multierr v1.6.1 // indirect + go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 // indirect gocloud.dev/pubsub/natspubsub v0.20.0 // indirect gocloud.dev/pubsub/rabbitpubsub v0.20.0 // indirect