Skip to content

[registry-facade] Remove feature flag #3182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .werft/values.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ components:
additionalConfig:
theiaSupervisorToken: "354c0b368f2b4a93b7b812564e663d23"

# Use Hosts SSD for perf and to not spam the boot disk
nodeDaemon:
theiaHostBasePath: /mnt/disks/ssd0

imageBuilder:
hostDindData: "/mnt/disks/ssd0/builder"
# configure GCP registry
Expand Down
7 changes: 0 additions & 7 deletions chart/config/proxy/vhost.upstreams.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ upstream dashboard {
keepalive 100;
}

upstream theiaserver {
server theia-server.${KUBE_NAMESPACE}.svc.cluster.local:80;

# Keep up to 100 connections to upstream alive and re-use them for faster responses
keepalive 100;
}

# TODO WSPROXY: remove conditional
{{- $wsProxy := .Values.components.wsProxy -}}
{{- if (and $wsProxy (not $wsProxy.disabled)) }}
Expand Down
28 changes: 0 additions & 28 deletions chart/templates/node-daemon-clusterrole.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions chart/templates/node-daemon-clusterrolebinding.yaml

This file was deleted.

129 changes: 0 additions & 129 deletions chart/templates/node-daemon-daemonset.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions chart/templates/node-daemon-role.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions chart/templates/node-daemon-rolebinding.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions chart/templates/node-daemon-serviceaccount.yaml

This file was deleted.

64 changes: 0 additions & 64 deletions chart/templates/theia-server-deployment.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions chart/templates/theia-server-service.yaml

This file was deleted.

16 changes: 16 additions & 0 deletions chart/templates/ws-daemon-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,22 @@ spec:
privileged: true
command: ["/bin/sh", "-c", "cp -f /installer/workspace_default.json /mnt/dst/workspace_default_{{ $gp.version }}.json"]
{{- end }}
- name: sysctl
image: {{ template "gitpod.comp.imageFull" $this }}
securityContext:
privileged: true
command:
- sh
- -c
- >
(
echo "running sysctls" &&
sysctl -w net.core.somaxconn=4096 &&
sysctl -w "net.ipv4.ip_local_port_range=5000 65000" &&
sysctl -w "net.ipv4.tcp_tw_reuse=1" &&
sysctl -w fs.inotify.max_user_watches=1000000 &&
sysctl -w "kernel.dmesg_restrict=1"
) && echo "done!" || echo "failed!"
containers:
- name: ws-daemon
volumeMounts:
Expand Down
1 change: 0 additions & 1 deletion chart/templates/ws-manager-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ data:
"portUrlTemplate": "{{- template "gitpod.scheme" $this -}}://{{"{{ .WorkspacePort }}"}}-{{"{{ .Prefix }}"}}.ws{{- if $.Values.installation.shortname -}}-{{ $.Values.installation.shortname }}{{- end -}}.{{ $.Values.hostname }}",
{{- end }}
"workspaceHostPath": "{{ .Values.components.wsDaemon.hostWorkspaceArea }}",
"theiaHostPath": "{{ .Values.components.nodeDaemon.theiaHostBasePath }}/theia/theia-{{ .Values.version }}",
"podTemplate": {
{{- if $wscomp.templates }}
{{ if (or $wscomp.templates.prebuild $wscomp.affinity) -}}"prebuildPath": "/workspace-template/prebuild.yaml",{{- end }}
Expand Down
8 changes: 0 additions & 8 deletions chart/templates/ws-proxy-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,10 @@ data:
"websocketIdleConnTimeout": "180s",
"maxIdleConns": 100
},
{{- if .Values.components.blobserve.disabled }}
"theiaServer": {
"scheme": "http",
"host": "theia-server.{{- .Release.Namespace -}}.svc.cluster.local:80",
"staticVersionPathPrefix": ""
},
{{- else }}
"blobServer": {
"scheme": "http",
"host": "blobserve.{{- .Release.Namespace -}}.svc.cluster.local:{{ .Values.components.blobserve.ports.service.servicePort }}"
},
{{- end }}
"gitpodInstallation": {
"scheme": "{{- template "gitpod.scheme" $this -}}",
"hostName": "{{- $gp.hostname -}}",
Expand Down
Loading