fix: add rootPath for helm values

beclab · Nov 15, 2024 · 508a4b4 · 508a4b4
1 parent b3b6895
commit 508a4b4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/pkg/users/userspace/v1/create.go b/pkg/users/userspace/v1/create.go
@@ -34,6 +34,8 @@ type Creator struct {
 const (
 	USER_SPACE_ROLE = "admin"
 	MAX_RAND_INT    = 1000000
+	olaresRootPath  = "OLARES_ROOT_DIR"
+	defaultRootPath = "/olares"
 )
 
 var (
@@ -197,6 +199,11 @@ func (c *Creator) installSysApps(ctx context.Context, bflPod *corev1.Pod) error
 			"username": c.user,
 		},
 	}
+	rootPath := defaultRootPath
+	if os.Getenv(olaresRootPath) != "" {
+		rootPath = os.Getenv(olaresRootPath)
+	}
+	vals["rootPath"] = rootPath
 
 	pvcData, err := c.findPVC(ctx, bflPod.Namespace)
 	if err != nil {
@@ -287,7 +294,11 @@ func (c *Creator) installLauncher(ctx context.Context, userspace string) (string
 		"appKey":    k,
 		"appSecret": s,
 	}
-
+	rootPath := defaultRootPath
+	if os.Getenv(olaresRootPath) != "" {
+		rootPath = os.Getenv(olaresRootPath)
+	}
+	vals["rootPath"] = rootPath
 	name := helm.ReleaseName("launcher", c.user)
 	err := helm.InstallCharts(ctx, c.helmCfg.ActionCfg, c.helmCfg.Settings, name, constants.UserChartsPath+"/launcher", "", userspace, vals)
 	if err != nil {