Skip to content

Commit c2b701b

Browse files
csweichelroboquat
authored andcommitted
[installer] Support workspace resource config
1 parent df120dc commit c2b701b

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

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

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
2929
return nil, err
3030
}
3131

32+
quantityString := func(idx corev1.ResourceList, key corev1.ResourceName) string {
33+
q, ok := idx[key]
34+
if !ok {
35+
return ""
36+
}
37+
return (&q).String()
38+
}
39+
3240
wsmcfg := config.ServiceConfiguration{
3341
// todo(sje): put in config values
3442
Manager: config.Configuration{
@@ -51,15 +59,20 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
5159
Container: config.AllContainerConfiguration{
5260
Workspace: config.ContainerConfiguration{
5361
Requests: config.ResourceConfiguration{
54-
CPU: "",
55-
Memory: "",
62+
CPU: quantityString(ctx.Config.Workspace.Resources.Requests, corev1.ResourceCPU),
63+
Memory: quantityString(ctx.Config.Workspace.Resources.Requests, corev1.ResourceMemory),
64+
Storage: quantityString(ctx.Config.Workspace.Resources.Requests, corev1.ResourceEphemeralStorage),
65+
},
66+
Limits: config.ResourceConfiguration{
67+
CPU: quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceCPU),
68+
Memory: quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceMemory),
69+
Storage: quantityString(ctx.Config.Workspace.Resources.Limits, corev1.ResourceEphemeralStorage),
5670
},
57-
Limits: config.ResourceConfiguration{},
58-
Image: "OVERWRITTEN-IN-REQUEST",
71+
Image: "OVERWRITTEN-IN-REQUEST",
5972
},
6073
},
6174
HeartbeatInterval: util.Duration(30 * time.Second),
62-
GitpodHostURL: "https://",
75+
GitpodHostURL: "https://" + ctx.Config.Domain,
6376
WorkspaceClusterHost: "",
6477
InitProbe: config.InitProbeConfiguration{
6578
Timeout: (1 * time.Second).String(),

0 commit comments

Comments
 (0)