refactor: simplify mount configuration by removing STORAGE_CLASS_DAEMONSET flag

- Remove separate STORAGE_CLASS_DAEMONSET environment variable
- DaemonSet mode is now automatically available when STORAGE_CLASS_SHARE_MOUNT is enabled
- Changed LoadDaemonSetNodeAffinity to assert mount sharing is enabled rather than conditionally check
- Updated documentation to reflect the simplified configuration
- Updated all tests to work without the removed flag

This simplifies the configuration model - when mount sharing is enabled,
users can choose between shared-pod (default) and daemonset modes via ConfigMap
without needing a separate environment variable.

Author: elijah-rou

cmd/controller.go

@@ -94,9 +94,6 @@ func parseControllerConfig() {
 	if os.Getenv("STORAGE_CLASS_SHARE_MOUNT") == "true" {
 		config.StorageClassShareMount = true
 	}
-	if os.Getenv("STORAGE_CLASS_DAEMONSET") == "true" {
-		config.StorageClassDaemonSet = true
-	}
 	if !config.Webhook {
 		// When not in sidecar mode, we should inherit attributes from CSI Node pod.
 		k8sclient, err := k8s.NewClient()

cmd/node.go

@@ -104,9 +104,6 @@ func parseNodeConfig() {
 	if os.Getenv("STORAGE_CLASS_SHARE_MOUNT") == "true" {
 		config.StorageClassShareMount = true
 	}
-	if os.Getenv("STORAGE_CLASS_DAEMONSET") == "true" {
-		config.StorageClassDaemonSet = true
-	}
 
 	if config.PodName == "" || config.Namespace == "" {
 		log.Info("Pod name & namespace can't be null.")

docs/en/guide/daemonset-mount.md

@@ -16,16 +16,16 @@ When `STORAGE_CLASS_SHARE_MOUNT` is enabled, JuiceFS CSI Driver shares Mount Pod
 
 ### Enable DaemonSet Mount
 
-To enable DaemonSet mount for StorageClass, set these environment variables in the CSI Driver deployment:
+DaemonSet mount is automatically available when mount sharing is enabled. To enable mount sharing, set this environment variable in the CSI Driver deployment:
 
 ```yaml
 env:
   - name: STORAGE_CLASS_SHARE_MOUNT
     value: "true"
-  - name: STORAGE_CLASS_DAEMONSET
-    value: "true"
 ```
 
+Once enabled, you can configure specific StorageClasses to use DaemonSet mode via the ConfigMap (see below).
+
 ### Configure Node Affinity
 
 There are two ways to configure node affinity for DaemonSet Mount Pods:
@@ -174,9 +174,9 @@ kubectl get pods -n kube-system -l juicefs.com/mount-by=juicefs-csi-driver
 
 ## Limitations
 
-- Node affinity is only applied when both `STORAGE_CLASS_SHARE_MOUNT` and `STORAGE_CLASS_DAEMONSET` are enabled
+- Node affinity is only applied when `STORAGE_CLASS_SHARE_MOUNT` is enabled and DaemonSet mode is configured
 - All PVCs using the same StorageClass share the same DaemonSet and node affinity rules
-- Changing node affinity requires recreating the StorageClass and associated PVCs
+- Changing node affinity requires recreating the DaemonSet (happens automatically when all PVCs are deleted)
 
 ## Migration
 

docs/en/guide/mount-pod-configuration.md

@@ -18,17 +18,16 @@ Set default behavior for all StorageClasses via environment variables in the CSI
 
 ```yaml
 env:
-  # For shared pod mode (default)
+  # Enable mount sharing (defaults to shared-pod mode)
   - name: STORAGE_CLASS_SHARE_MOUNT
     value: "true"
-  
-  # For DaemonSet mode
-  - name: STORAGE_CLASS_SHARE_MOUNT
-    value: "true"
-  - name: STORAGE_CLASS_DAEMONSET
-    value: "true"
 ```
 
+When `STORAGE_CLASS_SHARE_MOUNT` is enabled:
+- Default mode is `shared-pod` 
+- DaemonSet mode can be configured per StorageClass via ConfigMap
+- Per-PVC mode can still be explicitly configured via ConfigMap
+
 ### Per-StorageClass Configuration (ConfigMap)
 
 Override global defaults and configure individual StorageClasses using a ConfigMap:

pkg/config/config.go

@@ -50,8 +50,7 @@ var (
 	Webhook                = false            // start webhook server, used in sidecar mode or validating/mutating webhook
 	ValidatingWebhook      = false            // start validating webhook, applicable to ee only
 	Immutable              = false            // csi driver is running in an immutable environment
-	StorageClassShareMount = false            // share mount pod for the same storage class
-	StorageClassDaemonSet  = false            // deploy mount pods as DaemonSet for storage class
+	StorageClassShareMount = false            // share mount pod for the same storage class (enables shared-pod and daemonset modes)
 	AccessToKubelet        = false            // access kubelet or not
 
 	DriverName               = "csi.juicefs.com"

pkg/config/mount_config.go

@@ -140,10 +140,9 @@ func parseMountConfig(configData string) (*MountConfig, error) {
 // getDefaultMountMode returns the default mount mode based on environment variables
 func getDefaultMountMode() MountMode {
 	// Check global environment variable settings
+	// When StorageClassShareMount is enabled, default to shared-pod
+	// DaemonSet mode is only used when explicitly configured via ConfigMap
 	if StorageClassShareMount {
-		if StorageClassDaemonSet {
-			return MountModeDaemonSet
-		}
 		return MountModeSharedPod
 	}
 	return MountModePVC

pkg/config/mount_config_helper.go

@@ -80,9 +80,11 @@ func parseDaemonSetNodeAffinity(configData string) (*corev1.NodeAffinity, error)
 func LoadDaemonSetNodeAffinity(ctx context.Context, client *k8sclient.K8sClient, jfsSetting *JfsSetting) error {
 	log := klog.NewKlogr().WithName("mount-config")
 
-	// Skip if not using DaemonSet deployment
-	if !StorageClassShareMount || !StorageClassDaemonSet {
-		return nil
+	// This should only be called when mount sharing is enabled
+	// If we're here without mount sharing, it's a programming error
+	if !StorageClassShareMount {
+		log.Error(nil, "LoadDaemonSetNodeAffinity called but StorageClassShareMount is false - this should not happen")
+		return fmt.Errorf("LoadDaemonSetNodeAffinity called without mount sharing enabled")
 	}
 
 	// Skip if node affinity already set (from StorageClass parameters)

pkg/config/mount_config_test.go

@@ -93,7 +93,6 @@ func TestGetMountConfig(t *testing.T) {
 		storageClassName string
 		configMap        *corev1.ConfigMap
 		globalShareMount bool
-		globalDaemonSet  bool
 		wantMode         MountMode
 		wantHasAffinity  bool
 	}{
@@ -102,25 +101,15 @@ func TestGetMountConfig(t *testing.T) {
 			storageClassName: "test-sc",
 			configMap:        nil,
 			globalShareMount: false,
-			globalDaemonSet:  false,
 			wantMode:         MountModePVC,
 		},
 		{
 			name:             "no configmap, use global shared-pod",
 			storageClassName: "test-sc",
 			configMap:        nil,
 			globalShareMount: true,
-			globalDaemonSet:  false,
 			wantMode:         MountModeSharedPod,
 		},
-		{
-			name:             "no configmap, use global daemonset",
-			storageClassName: "test-sc",
-			configMap:        nil,
-			globalShareMount: true,
-			globalDaemonSet:  true,
-			wantMode:         MountModeDaemonSet,
-		},
 		{
 			name:             "configmap with default",
 			storageClassName: "test-sc",
@@ -179,7 +168,6 @@ nodeAffinity:
 		t.Run(tt.name, func(t *testing.T) {
 			// Set global variables
 			StorageClassShareMount = tt.globalShareMount
-			StorageClassDaemonSet = tt.globalDaemonSet
 
 			// Create fake k8s client
 			var objects []runtime.Object

pkg/config/setting.go

@@ -300,7 +300,7 @@ func ParseSetting(ctx context.Context, secrets, volCtx map[string]string, option
 
 		// Parse node affinity for DaemonSet deployment
 		// First check if it's in volCtx (for backward compatibility)
-		if volCtx["nodeAffinity"] != "" && StorageClassShareMount && StorageClassDaemonSet {
+		if volCtx["nodeAffinity"] != "" && StorageClassShareMount {
 			nodeAffinity := &corev1.NodeAffinity{}
 			if err := yaml.Unmarshal([]byte(volCtx["nodeAffinity"]), nodeAffinity); err != nil {
 				log.Error(err, "Failed to parse nodeAffinity", "nodeAffinity", volCtx["nodeAffinity"])

pkg/juicefs/mount/daemonset_mount_simple_test.go

@@ -243,33 +243,22 @@ func TestMountSelector_ConfigFallback(t *testing.T) {
 		configMap        *corev1.ConfigMap
 		storageClassName string
 		globalShareMount bool
-		globalDaemonSet  bool
 		wantMode         jfsConfig.MountMode
 	}{
 		{
 			name:             "no configmap, fallback to global per-pvc",
 			configMap:        nil,
 			storageClassName: "test-sc",
 			globalShareMount: false,
-			globalDaemonSet:  false,
 			wantMode:         jfsConfig.MountModePVC,
 		},
 		{
 			name:             "no configmap, fallback to global shared-pod",
 			configMap:        nil,
 			storageClassName: "test-sc",
 			globalShareMount: true,
-			globalDaemonSet:  false,
 			wantMode:         jfsConfig.MountModeSharedPod,
 		},
-		{
-			name:             "no configmap, fallback to global daemonset",
-			configMap:        nil,
-			storageClassName: "test-sc",
-			globalShareMount: true,
-			globalDaemonSet:  true,
-			wantMode:         jfsConfig.MountModeDaemonSet,
-		},
 		{
 			name: "invalid config in configmap, fallback to global",
 			configMap: &corev1.ConfigMap{
@@ -283,7 +272,6 @@ func TestMountSelector_ConfigFallback(t *testing.T) {
 			},
 			storageClassName: "test-sc",
 			globalShareMount: true,
-			globalDaemonSet:  false,
 			wantMode:         jfsConfig.MountModeSharedPod,
 		},
 		{
@@ -299,7 +287,6 @@ func TestMountSelector_ConfigFallback(t *testing.T) {
 			},
 			storageClassName: "test-sc",
 			globalShareMount: true,
-			globalDaemonSet:  true,
 			wantMode:         jfsConfig.MountModePVC,
 		},
 		{
@@ -315,7 +302,6 @@ func TestMountSelector_ConfigFallback(t *testing.T) {
 			},
 			storageClassName: "unknown-sc",
 			globalShareMount: false,
-			globalDaemonSet:  false,
 			wantMode:         jfsConfig.MountModeDaemonSet,
 		},
 	}
@@ -324,7 +310,6 @@ func TestMountSelector_ConfigFallback(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Set global variables
 			jfsConfig.StorageClassShareMount = tt.globalShareMount
-			jfsConfig.StorageClassDaemonSet = tt.globalDaemonSet
 
 			// Create fake k8s client
 			var objects []runtime.Object