fix unit test

Signed-off-by: zwwhdls <[email protected]>
juicedata · Sep 19, 2024 · d1e7bb6 · d1e7bb6
1 parent fa32e50
commit d1e7bb6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/pkg/juicefs/mount/builder/pod_test.go b/pkg/juicefs/mount/builder/pod_test.go
@@ -90,9 +90,6 @@ var (
 				Env: []corev1.EnvVar{{
 					Name:  "JFS_FOREGROUND",
 					Value: "1",
-				}, {
-					Name:  JfsCommEnv,
-					Value: "tmp/fuse_fd_csi_comm.sock",
 				}},
 				EnvFrom: []corev1.EnvFromSource{{
 					SecretRef: &corev1.SecretEnvSource{
@@ -119,6 +116,11 @@ var (
 					Privileged: &isPrivileged,
 					RunAsUser:  &rootUser,
 				},
+				Lifecycle: &corev1.Lifecycle{
+					PreStop: &corev1.Handler{
+						Exec: &corev1.ExecAction{Command: []string{"sh", "-c", "+e", fmt.Sprintf("umount %s -l; rmdir %s; exit 0", "/jfs/default-imagenet", "/jfs/default-imagenet")}},
+					},
+				},
 				Ports: []corev1.ContainerPort{
 					{
 						Name:          "metrics",

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -592,17 +592,11 @@ func parseClientVersion(ce bool, version string) ClientVersion {
 
 func SupportUpgradeRecreate(ce bool, version string) bool {
 	v := parseClientVersion(ce, version)
-	if v.Dev {
-		return false
-	}
 	return supportFusePass(v)
 }
 
 func SupportUpgradeBinary(ce bool, version string) bool {
 	v := parseClientVersion(ce, version)
-	if v.Dev {
-		return false
-	}
 	return supportUpgradeBinary(v)
 }
 

diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
@@ -681,7 +681,7 @@ func TestClientVersion_SupportFusePass(t *testing.T) {
 		{
 			name:  "dev",
 			image: "juicedata/mount:ee-nightly",
-			want:  true,
+			want:  false,
 		},
 		{
 			name:  "ce-1.2.1",
@@ -690,7 +690,7 @@ func TestClientVersion_SupportFusePass(t *testing.T) {
 		},
 		{
 			name:  "ee-5.1.0",
-			image: "juicedata/mount:ee-v5.1.0-xxx",
+			image: "juicedata/mount:ee-5.1.0-xxx",
 			want:  true,
 		},
 	}