diff --git a/pkg/apiserver/handler_system.go b/pkg/apiserver/handler_system.go index 3b4d730..0dc4eb8 100644 --- a/pkg/apiserver/handler_system.go +++ b/pkg/apiserver/handler_system.go @@ -45,13 +45,13 @@ func (h *Handler) enableServiceSync(req *restful.Request, resp *restful.Response } vals := make(map[string]interface{}) - vals["bfl"] = map[string]string{ + vals["bfl"] = map[string]interface{}{ "username": owner, "nodeName": bfl.Spec.NodeName, } // appCache hostpath to mount with apps - vals["userspace"] = map[string]string{ + vals["userspace"] = map[string]interface{}{ "appCache": fmt.Sprintf("%s/Cache", pvPath), "userData": fmt.Sprintf("%s/Home", pvPath), } @@ -105,12 +105,12 @@ func (h *Handler) enableServiceBackup(req *restful.Request, resp *restful.Respon } vals := make(map[string]interface{}) - vals["bfl"] = map[string]string{ + vals["bfl"] = map[string]interface{}{ "username": owner, "nodeName": bfl.Spec.NodeName, } - vals["userspace"] = map[string]string{ + vals["userspace"] = map[string]interface{}{ "appCache": fmt.Sprintf("%s/Cache", pvPath), "userData": fmt.Sprintf("%s/Home", pvPath), } diff --git a/pkg/users/userspace/v1/create.go b/pkg/users/userspace/v1/create.go index 8b926f7..c56f7b4 100644 --- a/pkg/users/userspace/v1/create.go +++ b/pkg/users/userspace/v1/create.go @@ -186,7 +186,7 @@ func (c *Creator) installSysApps(ctx context.Context, bflPod *corev1.Pod) error bflDocURL := fmt.Sprintf("//%s:%d/bfl/apidocs.json", ip, port) - vals["bfl"] = map[string]string{ + vals["bfl"] = map[string]interface{}{ "username": c.user, "nodeName": bflPod.Spec.NodeName, "url": bflDocURL, @@ -210,11 +210,11 @@ func (c *Creator) installSysApps(ctx context.Context, bflPod *corev1.Pod) error // pvc to mount with filebrowser pvPath := pv.Spec.HostPath.Path - vals["pvc"] = map[string]string{ + vals["pvc"] = map[string]interface{}{ "userspace": pvcData.userspacePvc, } - vals["userspace"] = map[string]string{ + vals["userspace"] = map[string]interface{}{ "appCache": pvcData.appCacheHostPath, "userData": fmt.Sprintf("%s/Home", pvPath), "appData": fmt.Sprintf("%s/Data", pvPath), @@ -253,7 +253,7 @@ func (c *Creator) installSysApps(ctx context.Context, bflPod *corev1.Pod) error if err != nil { return err } - vals["kubesphere"] = map[string]string{ + vals["kubesphere"] = map[string]interface{}{ "redis_password": string(redisSecret.Data["auth"]), } @@ -282,7 +282,7 @@ func (c *Creator) installLauncher(ctx context.Context, userspace string) (string vals := make(map[string]interface{}) k, s := c.genAppkeyAndSecret("bfl") - vals["bfl"] = map[string]string{ + vals["bfl"] = map[string]interface{}{ "username": c.user, "appKey": k, "appSecret": s,