Merge pull request ceph#338 from black-dragon74/cephfs-fix-merge-spec

Madhu-1 · web-flow · commit 2618dfbb3069 · 2025-10-06T09:50:47.000+02:00
driver: only apply default `cephFSClientType` when unset
diff --git a/internal/controller/driver_controller.go b/internal/controller/driver_controller.go
@@ -1849,7 +1849,7 @@ func mergeDriverSpecs(dest, src *csiv1.DriverSpec) {
 	if dest.FuseMountOptions == nil {
 		dest.FuseMountOptions = src.FuseMountOptions
 	}
-	if src.CephFsClientType != "" {
+	if dest.CephFsClientType == "" {
 		dest.CephFsClientType = src.CephFsClientType
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1849,7 +1849,7 @@ func mergeDriverSpecs(dest, src *csiv1.DriverSpec) {`
`1849`	`1849`	`if dest.FuseMountOptions == nil {`
`1850`	`1850`	`dest.FuseMountOptions = src.FuseMountOptions`
`1851`	`1851`	`}`
`1852`		`- if src.CephFsClientType != "" {`
	`1852`	`+ if dest.CephFsClientType == "" {`
`1853`	`1853`	`dest.CephFsClientType = src.CephFsClientType`
`1854`	`1854`	`}`
`1855`	`1855`	`}`