aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Santos <danlsgiga@gmail.com>2021-01-27 21:12:13 -0700
committerDaniel Santos <danlsgiga@gmail.com>2021-01-27 21:12:13 -0700
commitca767fdce1caa6e25d68979266f4c065051f5912 (patch)
tree10c7a4fd2488253ee2b495ac7038abbd1d3ad862
parent78445097900a796b6ced7be57d600e2b5f0cf9d6 (diff)
downloadseaweedfs-csi-driver-ca767fdce1caa6e25d68979266f4c065051f5912.tar.xz
seaweedfs-csi-driver-ca767fdce1caa6e25d68979266f4c065051f5912.zip
Match variable names to Context instead of Parameters
-rw-r--r--pkg/driver/mounter.go4
-rw-r--r--pkg/driver/mounter_seaweedfs.go16
-rw-r--r--pkg/driver/nodeserver.go4
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
}