[installer] improve ws-manager config

Author: sagor999

install/installer/pkg/components/ws-manager/configmap.go

@@ -66,6 +66,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 					CPU:              quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceCPU),
 					Memory:           quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceMemory),
 					EphemeralStorage: quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceEphemeralStorage),
+					Storage:          quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceStorage),
 				},
 			},
 			Templates: templatesCfg,
@@ -76,6 +77,20 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			},
 		},
 	}
+
+	installationShortNameSuffix := ""
+	if ctx.Config.Metadata.InstallationShortname != "" && ctx.Config.Metadata.InstallationShortname != configv1.InstallationShortNameOldDefault {
+		installationShortNameSuffix = "-" + ctx.Config.Metadata.InstallationShortname
+	}
+
+	var schedulerName string
+	gitpodHostURL := "https://" + ctx.Config.Domain
+	workspaceClusterHost := fmt.Sprintf("ws.%s", ctx.Config.Domain)
+	workspaceURLTemplate := fmt.Sprintf("https://{{ .Prefix }}.ws%s.%s", installationShortNameSuffix, ctx.Config.Domain)
+	workspacePortURLTemplate := fmt.Sprintf("https://{{ .WorkspacePort }}-{{ .Prefix }}.ws%s.%s", installationShortNameSuffix, ctx.Config.Domain)
+
+	rateLimits := map[string]grpc.RateLimit{}
+
 	err = ctx.WithExperimental(func(ucfg *experimental.Config) error {
 		if ucfg.Workspace == nil {
 			return nil
@@ -102,6 +117,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 						CPU:              quantityString(c.Resources.Limits, corev1.ResourceCPU),
 						Memory:           quantityString(c.Resources.Limits, corev1.ResourceMemory),
 						EphemeralStorage: quantityString(c.Resources.Limits, corev1.ResourceEphemeralStorage),
+						Storage:          quantityString(c.Resources.Limits, corev1.ResourceStorage),
 					},
 				},
 				Templates: tplsCfg,
@@ -114,20 +130,31 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 				tpls[tmpl_n] = tmpl_v
 			}
 		}
+		schedulerName = ucfg.Workspace.SchedulerName
+		if ucfg.Workspace.HostURL != "" {
+			gitpodHostURL = ucfg.Workspace.HostURL
+		}
+		if ucfg.Workspace.WorkspaceClusterHost != "" {
+			workspaceClusterHost = ucfg.Workspace.WorkspaceClusterHost
+		}
+		if ucfg.Workspace.WorkspaceURLTemplate != "" {
+			workspaceURLTemplate = ucfg.Workspace.WorkspaceURLTemplate
+		}
+		if ucfg.Workspace.WorkspacePortURLTemplate != "" {
+			workspacePortURLTemplate = ucfg.Workspace.WorkspacePortURLTemplate
+		}
+		rateLimits = ucfg.Workspace.WSManagerRateLimits
+
 		return nil
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	installationShortNameSuffix := ""
-	if ctx.Config.Metadata.InstallationShortname != "" && ctx.Config.Metadata.InstallationShortname != configv1.InstallationShortNameOldDefault {
-		installationShortNameSuffix = "-" + ctx.Config.Metadata.InstallationShortname
-	}
-
 	wsmcfg := config.ServiceConfiguration{
 		Manager: config.Configuration{
 			Namespace:      ctx.Namespace,
+			SchedulerName:  schedulerName,
 			SeccompProfile: fmt.Sprintf("localhost/workspace_default_%s.json", ctx.VersionManifest.Version),
 			DryRun:         false,
 			WorkspaceDaemon: config.WorkspaceDaemonConfiguration{
@@ -144,13 +171,13 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			},
 			WorkspaceClasses:     classes,
 			HeartbeatInterval:    util.Duration(30 * time.Second),
-			GitpodHostURL:        "https://" + ctx.Config.Domain,
-			WorkspaceClusterHost: fmt.Sprintf("ws.%s", ctx.Config.Domain),
+			GitpodHostURL:        gitpodHostURL,
+			WorkspaceClusterHost: workspaceClusterHost,
 			InitProbe: config.InitProbeConfiguration{
 				Timeout: (1 * time.Second).String(),
 			},
-			WorkspaceURLTemplate:     fmt.Sprintf("https://{{ .Prefix }}.ws%s.%s", installationShortNameSuffix, ctx.Config.Domain),
-			WorkspacePortURLTemplate: fmt.Sprintf("https://{{ .WorkspacePort }}-{{ .Prefix }}.ws%s.%s", installationShortNameSuffix, ctx.Config.Domain),
+			WorkspaceURLTemplate:     workspaceURLTemplate,
+			WorkspacePortURLTemplate: workspacePortURLTemplate,
 			WorkspaceHostPath:        wsdaemon.HostWorkingArea,
 			Timeouts: config.WorkspaceTimeoutConfiguration{
 				AfterClose:          timeoutAfterClose,
@@ -190,7 +217,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 				Certificate: "/certs/tls.crt",
 				PrivateKey:  "/certs/tls.key",
 			},
-			RateLimits: map[string]grpc.RateLimit{}, // todo(sje) add values
+			RateLimits: rateLimits,
 		},
 		ImageBuilderProxy: struct {
 			TargetAddr string "json:\"targetAddr\""

install/installer/pkg/config/v1/experimental/experimental.go

@@ -12,6 +12,7 @@ package experimental
 
 import (
 	agentSmith "github.com/gitpod-io/gitpod/agent-smith/pkg/config"
+	"github.com/gitpod-io/gitpod/common-go/grpc"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 )
@@ -48,8 +49,13 @@ type NodeToContainerMappingValues struct {
 }
 
 type WorkspaceConfig struct {
-	Tracing *Tracing `json:"tracing,omitempty"`
-	Stage   string   `json:"stage"`
+	Tracing                  *Tracing `json:"tracing,omitempty"`
+	Stage                    string   `json:"stage,omitempty"`
+	SchedulerName            string   `json:"schedulerName,omitempty"`
+	HostURL                  string   `json:"hostURL,omitempty"`
+	WorkspaceClusterHost     string   `json:"workspaceClusterHost,omitempty"`
+	WorkspaceURLTemplate     string   `json:"workspaceURLTemplate,omitempty"`
+	WorkspacePortURLTemplate string   `json:"workspacePortURLTemplate,omitempty"`
 
 	CPULimits struct {
 		Enabled          bool              `json:"enabled"`
@@ -64,6 +70,8 @@ type WorkspaceConfig struct {
 		ReadIOPS         int64             `json:"readIOPS"`
 	} `json:"ioLimits"`
 
+	WSManagerRateLimits map[string]grpc.RateLimit `json:"wsManagerRateLimits,omitempty"`
+
 	RegistryFacade struct {
 		IPFSCache struct {
 			Enabled  bool   `json:"enabled"`