Skip to content

Commit 61b1b9b

Browse files
author
Christian Weichel
committed
[node-daemon] Remove because we don't copy Theia
to the node anymore. Instead, registry-facade serves the IDE. The remaining sysctls were moved as init container to ws-daemon.
1 parent 1046faf commit 61b1b9b

37 files changed

+19
-434
lines changed

.werft/values.dev.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ components:
111111
additionalConfig:
112112
theiaSupervisorToken: "354c0b368f2b4a93b7b812564e663d23"
113113

114-
# Use Hosts SSD for perf and to not spam the boot disk
115-
nodeDaemon:
116-
theiaHostBasePath: /mnt/disks/ssd0
117-
118114
imageBuilder:
119115
hostDindData: "/mnt/disks/ssd0/builder"
120116
# configure GCP registry

chart/templates/node-daemon-clusterrole.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

chart/templates/node-daemon-clusterrolebinding.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

chart/templates/node-daemon-daemonset.yaml

Lines changed: 0 additions & 129 deletions
This file was deleted.

chart/templates/node-daemon-role.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

chart/templates/node-daemon-rolebinding.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

chart/templates/node-daemon-serviceaccount.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

chart/templates/ws-daemon-daemonset.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,22 @@ spec:
128128
privileged: true
129129
command: ["/bin/sh", "-c", "cp -f /installer/workspace_default.json /mnt/dst/workspace_default_{{ $gp.version }}.json"]
130130
{{- end }}
131+
- name: sysctl
132+
image: {{ template "gitpod.comp.imageFull" $this }}
133+
securityContext:
134+
privileged: true
135+
command:
136+
- sh
137+
- -c
138+
- >
139+
(
140+
echo "running sysctls" &&
141+
sysctl -w net.core.somaxconn=4096 &&
142+
sysctl -w "net.ipv4.ip_local_port_range=5000 65000" &&
143+
sysctl -w "net.ipv4.tcp_tw_reuse=1" &&
144+
sysctl -w fs.inotify.max_user_watches=1000000 &&
145+
sysctl -w "kernel.dmesg_restrict=1"
146+
) && echo "done!" || echo "failed!"
131147
containers:
132148
- name: ws-daemon
133149
volumeMounts:

chart/templates/ws-manager-configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ data:
7878
"portUrlTemplate": "{{- template "gitpod.scheme" $this -}}://{{"{{ .WorkspacePort }}"}}-{{"{{ .Prefix }}"}}.ws{{- if $.Values.installation.shortname -}}-{{ $.Values.installation.shortname }}{{- end -}}.{{ $.Values.hostname }}",
7979
{{- end }}
8080
"workspaceHostPath": "{{ .Values.components.wsDaemon.hostWorkspaceArea }}",
81-
"theiaHostPath": "{{ .Values.components.nodeDaemon.theiaHostBasePath }}/theia/theia-{{ .Values.version }}",
8281
"podTemplate": {
8382
{{- if $wscomp.templates }}
8483
{{ if (or $wscomp.templates.prebuild $wscomp.affinity) -}}"prebuildPath": "/workspace-template/prebuild.yaml",{{- end }}

chart/values.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@ serverProxyApiKey: "fF7+aCPvF9Pa0AEjmoZ+yWVh6PqBjM5VEA0wyQs3FH4="
144144
previewFeatureFlags: ["user_namespace"]
145145

146146
components:
147-
nodeDaemon:
148-
name: "node-daemon"
149-
theiaHostBasePath: /var/gitpod
150147

151148
blobserve:
152149
name: "blobserve"

0 commit comments

Comments
 (0)