diff options
| author | Ruakij <ruakij@ruekov.eu> | 2023-01-16 12:49:54 +0100 |
|---|---|---|
| committer | Ruakij <ruakij@ruekov.eu> | 2023-01-16 12:49:54 +0100 |
| commit | ae6e1c343ee742c06df762111f74158fe2a24159 (patch) | |
| tree | 423a9c9e38d5fabc1a53156af64667d096afadb8 /pkg/driver | |
| parent | cf8fc84abff38937f097c117f9345668373547ea (diff) | |
| download | seaweedfs-csi-driver-ae6e1c343ee742c06df762111f74158fe2a24159.tar.xz seaweedfs-csi-driver-ae6e1c343ee742c06df762111f74158fe2a24159.zip | |
Create ignoreArgs for args we want to handle explicitly
Diffstat (limited to 'pkg/driver')
| -rw-r--r-- | pkg/driver/mounter_seaweedfs.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go index 51adfdb..7035cd4 100644 --- a/pkg/driver/mounter_seaweedfs.go +++ b/pkg/driver/mounter_seaweedfs.go @@ -94,11 +94,14 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) (Unmounter, error) { "diskType": "disk", } + // Fields supplied in context, but ignored because they are handled explicitly somewhere else + ignoreArgs := []string{ + "volumeCapacity", + } + // Merge volContext into argsMap with key-mapping for arg, value := range seaweedFs.volContext { - if(arg == "volumeCapacity"){ // Ignore volumeCapacity, not the nicest solution like this :/ - continue - } + if(in_arr(ignoreArgs, arg)){continue} // Check if key-mapping exists newArg, ok := parameterArgMap[arg] @@ -153,3 +156,12 @@ func parseVolumeCapacity(volumeCapacity string) int64 { capacityMB := capacity / 1024 / 1024 return capacityMB } + +func in_arr(arr []string, val string) bool { + for _, v := range arr { + if(val == v) { + return true + } + } + return false +} |
