Merge pull request #206 from iPraveenParihar/fix/improper-args-format

csi: correct conditional logic for fuse mount options argument
ceph · Feb 25, 2025 · e58debc · e58debc
2 parents 31a93b4 + 3de720a
commit e58debc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/controller/driver_controller.go b/internal/controller/driver_controller.go
@@ -1560,6 +1560,9 @@ func mergeDriverSpecs(dest, src *csiv1a1.DriverSpec) {
 	if dest.KernelMountOptions == nil {
 		dest.KernelMountOptions = src.KernelMountOptions
 	}
+	if dest.FuseMountOptions == nil {
+		dest.FuseMountOptions = src.FuseMountOptions
+	}
 	if src.CephFsClientType != "" {
 		dest.CephFsClientType = src.CephFsClientType
 	}

diff --git a/internal/utils/csi.go b/internal/utils/csi.go
@@ -439,14 +439,14 @@ func LogRotateConfigMapName(driverName string) string {
 func KernelMountOptionsContainerArg(options map[string]string) string {
 	return If(
 		len(options) > 0,
-		fmt.Sprintf("--kernelmountoptions==%s", MapToString(options, "=", ",")),
+		fmt.Sprintf("--kernelmountoptions=%s", MapToString(options, "=", ",")),
 		"",
 	)
 }
 func FuseMountOptionsContainerArg(options map[string]string) string {
 	return If(
-		len(options) == 0,
-		fmt.Sprintf("--fusemountoptions==%s", MapToString(options, "=", ",")),
+		len(options) > 0,
+		fmt.Sprintf("--fusemountoptions=%s", MapToString(options, "=", ",")),
 		"",
 	)
 }