revert #741: bind fuse connections into mount pod (#746)

Signed-off-by: xixi <[email protected]>
juicedata · Sep 11, 2023 · ecddc72 · ecddc72
1 parent 53e66bb
commit ecddc72
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 49 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -51,8 +51,6 @@ var (
 	JFSMountPriorityName     = "system-node-critical"
 	JFSMountPreemptionPolicy = ""
 
-	FuseConnectionPath = "/sys/fs/fuse/connections"
-
 	TmpPodMountBase = "/tmp"
 	PodMountBase    = "/jfs"
 	MountBase       = "/var/lib/jfs"

diff --git a/pkg/juicefs/mount/builder/common.go b/pkg/juicefs/mount/builder/common.go
@@ -28,11 +28,10 @@ import (
 )
 
 const (
-	JfsDirName         = "jfs-dir"
-	FuseConnectinsName = "fuse-connections"
-	JfsRootDirName     = "jfs-root-dir"
-	UpdateDBDirName    = "updatedb"
-	UpdateDBCfgFile    = "/etc/updatedb.conf"
+	JfsDirName      = "jfs-dir"
+	JfsRootDirName  = "jfs-root-dir"
+	UpdateDBDirName = "updatedb"
+	UpdateDBCfgFile = "/etc/updatedb.conf"
 )
 
 type Builder struct {
@@ -87,26 +86,15 @@ func (r *Builder) getVolumes() []corev1.Volume {
 	dir := corev1.HostPathDirectoryOrCreate
 	file := corev1.HostPathFileOrCreate
 	secretName := r.jfsSetting.SecretName
-	volumes := []corev1.Volume{
-		{
-			Name: JfsDirName,
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: config.MountPointPath,
-					Type: &dir,
-				},
-			},
-		},
-		{
-			Name: FuseConnectinsName,
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: config.FuseConnectionPath,
-					Type: &dir,
-				},
+	volumes := []corev1.Volume{{
+		Name: JfsDirName,
+		VolumeSource: corev1.VolumeSource{
+			HostPath: &corev1.HostPathVolumeSource{
+				Path: config.MountPointPath,
+				Type: &dir,
 			},
 		},
-	}
+	}}
 
 	if !config.Immutable {
 		volumes = append(volumes, corev1.Volume{
@@ -171,18 +159,11 @@ func (r *Builder) getVolumes() []corev1.Volume {
 
 func (r *Builder) getVolumeMounts() []corev1.VolumeMount {
 	mp := corev1.MountPropagationBidirectional
-	volumeMounts := []corev1.VolumeMount{
-		{
-			Name:             JfsDirName,
-			MountPath:        config.PodMountBase,
-			MountPropagation: &mp,
-		},
-		{
-			Name:             FuseConnectinsName,
-			MountPath:        config.FuseConnectionPath,
-			MountPropagation: &mp,
-		},
-	}
+	volumeMounts := []corev1.VolumeMount{{
+		Name:             JfsDirName,
+		MountPath:        config.PodMountBase,
+		MountPropagation: &mp,
+	}}
 
 	if !config.Immutable {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{

diff --git a/pkg/juicefs/mount/builder/pod_test.go b/pkg/juicefs/mount/builder/pod_test.go
@@ -75,14 +75,6 @@ var (
 							Type: &dir,
 						},
 					},
-				}, {
-					Name: FuseConnectinsName,
-					VolumeSource: corev1.VolumeSource{
-						HostPath: &corev1.HostPathVolumeSource{
-							Path: config.FuseConnectionPath,
-							Type: &dir,
-						},
-					},
 				}, {
 					Name: UpdateDBDirName,
 					VolumeSource: corev1.VolumeSource{
@@ -114,10 +106,6 @@ var (
 						MountPath:        config.PodMountBase,
 						MountPropagation: &mp,
 					}, {
-						Name:             FuseConnectinsName,
-						MountPath:        config.FuseConnectionPath,
-						MountPropagation: &mp,
-					}, {
 
 						Name:             UpdateDBDirName,
 						MountPath:        UpdateDBCfgFile,