weiyilai · pull · Dec 17, 2025 · Dec 16, 2025 · Dec 12, 2025 · Dec 17, 2025
diff --git a/deploy/charts/library/templates/_cluster-role.tpl b/deploy/charts/library/templates/_cluster-role.tpl
@@ -61,6 +61,7 @@ rules:
     resources:
       - cephclients
       - cephclusters
+      - cephclusters/finalizers
       - cephblockpools
       - cephfilesystems
       - cephnfses

diff --git a/deploy/examples/common.yaml b/deploy/examples/common.yaml
@@ -998,6 +998,7 @@ rules:
     resources:
       - cephclients
       - cephclusters
+      - cephclusters/finalizers
       - cephblockpools
       - cephfilesystems
       - cephnfses

diff --git a/pkg/operator/ceph/csi/config.go b/pkg/operator/ceph/csi/config.go
@@ -85,15 +85,7 @@ func generateProfileSubVolumeGroupSpec(clusterInfo *cephclient.ClusterInfo, ceph
 		},
 	}
 
-	if !reflect.DeepEqual(clusterInfo.CSIDriverSpec.CephFS, cephv1.CSICephFSSpec{}) {
-		if clusterInfo.CSIDriverSpec.CephFS.KernelMountOptions != "" {
-			kernelMountKeyVal := strings.Split(clusterInfo.CSIDriverSpec.CephFS.KernelMountOptions, "=")
-			csiOpClientProfile.Spec.CephFs.KernelMountOptions = map[string]string{kernelMountKeyVal[0]: kernelMountKeyVal[1]}
-		} else if clusterInfo.CSIDriverSpec.CephFS.FuseMountOptions != "" {
-			fuseMountKeyVal := strings.Split(clusterInfo.CSIDriverSpec.CephFS.FuseMountOptions, "=")
-			csiOpClientProfile.Spec.CephFs.FuseMountOptions = map[string]string{fuseMountKeyVal[0]: fuseMountKeyVal[1]}
-		}
-	}
+	applyCephFSMountOptions(clusterInfo, csiOpClientProfile.Spec.CephFs)
 
 	return csiOpClientProfile
 }
@@ -110,29 +102,13 @@ func CreateDefaultClientProfile(c client.Client, clusterInfo *cephclient.Cluster
 		},
 	}
 
-	if !reflect.DeepEqual(clusterInfo.CSIDriverSpec.CephFS, cephv1.CSICephFSSpec{}) {
-		if clusterInfo.CSIDriverSpec.CephFS.KernelMountOptions != "" {
-			kernelMountKeyVal := strings.Split(clusterInfo.CSIDriverSpec.CephFS.KernelMountOptions, "=")
-			if len(kernelMountKeyVal) >= 2 {
-				csiOpClientProfile.Spec.CephFs = &csiopv1.CephFsConfigSpec{
-					KernelMountOptions: map[string]string{kernelMountKeyVal[0]: kernelMountKeyVal[1]},
-				}
-			}
-		} else if clusterInfo.CSIDriverSpec.CephFS.FuseMountOptions != "" {
-			fuseMountKeyVal := strings.Split(clusterInfo.CSIDriverSpec.CephFS.FuseMountOptions, "=")
-			if len(fuseMountKeyVal) >= 2 {
-				csiOpClientProfile.Spec.CephFs = &csiopv1.CephFsConfigSpec{
-					FuseMountOptions: map[string]string{fuseMountKeyVal[0]: fuseMountKeyVal[1]},
-				}
-			}
-		}
-	}
-
 	// set cephFS ControllerPublish Secret
 	if csiOpClientProfile.Spec.CephFs == nil {
 		csiOpClientProfile.Spec.CephFs = &csiopv1.CephFsConfigSpec{}
 	}
 
+	applyCephFSMountOptions(clusterInfo, csiOpClientProfile.Spec.CephFs)
+
 	csiOpClientProfile.Spec.CephFs.CephCsiSecrets = &csiopv1.CephCsiSecretsSpec{
 		ControllerPublishSecret: v1.SecretReference{
 			Name:      CsiCephFSProvisionerSecret,
@@ -178,3 +154,34 @@ func createUpdateClientProfile(c client.Client, clusterInfo *cephclient.ClusterI
 
 	return nil
 }
+
+func applyCephFSMountOptions(clusterInfo *cephclient.ClusterInfo, cephFs *csiopv1.CephFsConfigSpec) {
+	if reflect.DeepEqual(clusterInfo.CSIDriverSpec.CephFS, cephv1.CSICephFSSpec{}) {
+		return
+	}
+
+	if clusterInfo.CSIDriverSpec.CephFS.KernelMountOptions != "" {
+		cephFs.KernelMountOptions = parseMountOptions(clusterInfo.CSIDriverSpec.CephFS.KernelMountOptions)
+	} else if clusterInfo.CSIDriverSpec.CephFS.FuseMountOptions != "" {
+		cephFs.FuseMountOptions = parseMountOptions(clusterInfo.CSIDriverSpec.CephFS.FuseMountOptions)
+	}
+}
+
+func parseMountOptions(options string) map[string]string {
+	logger.Debugf("parsing CephFS mount options : %s ", options)
+	result := map[string]string{}
+	// Example: SplitSeq("ms_mode=prefer-secure,recover_session=clean", ",") iterates over ["ms_mode=prefer-secure", "recover_session=clean"]
+	for part := range strings.SplitSeq(options, ",") {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		// Example: SplitN("ms_mode=prefer-secure", "=", 2) returns ["ms_mode", "prefer-secure"]
+		keyVal := strings.SplitN(part, "=", 2)
+		if len(keyVal) == 2 {
+			result[strings.TrimSpace(keyVal[0])] = strings.TrimSpace(keyVal[1])
+		}
+	}
+	logger.Debugf("parsed CephFS mount options: %v", result)
+	return result
+}
diff --git a/pkg/operator/ceph/csi/config_test.go b/pkg/operator/ceph/csi/config_test.go
@@ -81,3 +81,34 @@ func TestCreateUpdateClientProfile(t *testing.T) {
 	assert.Equal(t, csiOpClientProfile.Spec.CephFs.SubVolumeGroup, cephSubVolGrpNamespacedName.Name)
 	assert.Equal(t, csiOpClientProfile.Spec.CephFs.KernelMountOptions["ms_mode"], kernelMountKeyVal[1])
 }
+
+func TestParseMountOptions(t *testing.T) {
+	t.Run("single mount option", func(t *testing.T) {
+		options := "ms_mode=crc"
+		result := parseMountOptions(options)
+		assert.Equal(t, 1, len(result))
+		assert.Equal(t, "crc", result["ms_mode"])
+	})
+
+	t.Run("multiple mount options", func(t *testing.T) {
+		options := "ms_mode=prefer-secure,recover_session=clean"
+		result := parseMountOptions(options)
+		assert.Equal(t, 2, len(result))
+		assert.Equal(t, "prefer-secure", result["ms_mode"])
+		assert.Equal(t, "clean", result["recover_session"])
+	})
+
+	t.Run("multiple mount options with spaces", func(t *testing.T) {
+		options := "ms_mode=prefer-secure, recover_session=clean"
+		result := parseMountOptions(options)
+		assert.Equal(t, 2, len(result))
+		assert.Equal(t, "prefer-secure", result["ms_mode"])
+		assert.Equal(t, "clean", result["recover_session"])
+	})
+
+	t.Run("empty string", func(t *testing.T) {
+		options := ""
+		result := parseMountOptions(options)
+		assert.Equal(t, 0, len(result))
+	})
+}