Skip to content

Commit

Permalink
Remove ws-scheduler
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf authored and roboquat committed Jan 24, 2022
1 parent c7ef974 commit 82d786e
Show file tree
Hide file tree
Showing 147 changed files with 489 additions and 10,411 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ venv/
charts/gitpod_io/secrets/decrypted

# Build artifacts
components/ws-scheduler/ws-scheduler
components/ws-proxy/ws-proxy

# Logs
Expand Down
2 changes: 1 addition & 1 deletion .werft/util/kubectl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export async function deleteNonNamespaceObjects(namespace: string, destname: str
exec(`/usr/local/bin/helm3 delete gitpod-${destname} || echo gitpod-${destname} was not installed yet`, { ...shellOpts });

let objs = [];
["ws-scheduler", "node-daemon", "cluster", "workspace", "jaeger", "jaeger-agent", "ws-sync", "ws-manager-node", "ws-daemon", "registry-facade"].forEach(comp =>
["node-daemon", "cluster", "workspace", "jaeger", "jaeger-agent", "ws-sync", "ws-manager-node", "ws-daemon", "registry-facade"].forEach(comp =>
["ClusterRole", "ClusterRoleBinding", "PodSecurityPolicy"].forEach(kind =>
exec(`kubectl get ${kind} -l component=${comp} --no-headers -o=custom-columns=:metadata.name | grep ${namespace}-ns`, { ...shellOpts, dontCheckRc: true, async: false })
.split("\n")
Expand Down
3 changes: 0 additions & 3 deletions WORKSPACE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ defaultVariant:

variants:
- name: oss
components:
exclude:
- components/ee/ws-scheduler
srcs:
exclude:
- "**/ee"
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 @@ -22,7 +22,6 @@ data:
{
"manager": {
"namespace": "{{ .Release.Namespace }}",
"schedulerName": "{{ .Values.workspaceScheduler }}",
{{- if $wsdaemon.userNamespaces.seccompProfileInstaller.enabled }}
"seccompProfile": "localhost/workspace_default_{{ $gp.version }}.json",
{{- else }}
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/ws-manager-tlssecret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{- $this := dict "root" . "gp" $.Values "comp" $comp -}}
{{- if not $comp.disabled -}}
{{- $serverAltNames := list ( printf "%s.%s" (include "gitpod.fullname" .) .Release.Namespace ) ( printf "%s.%s.svc" "ws-manager" .Release.Namespace ) "ws-manager" "ws-manager-dev" -}}
{{- $clientAltNames := list "registry-facade" "server" "ws-manager-bridge" "ws-scheduler" "ws-proxy" "ws-manager" -}}
{{- $clientAltNames := list "registry-facade" "server" "ws-manager-bridge" "ws-proxy" "ws-manager" -}}
{{- $server := $comp.tls.server }}
{{- $client := $comp.tls.client }}

Expand Down
53 changes: 0 additions & 53 deletions chart/templates/ws-scheduler-clusterrole.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions chart/templates/ws-scheduler-clusterrolebinding.yaml

This file was deleted.

66 changes: 0 additions & 66 deletions chart/templates/ws-scheduler-configmap.yaml

This file was deleted.

71 changes: 0 additions & 71 deletions chart/templates/ws-scheduler-deployment.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions chart/templates/ws-scheduler-networkpolicy.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions chart/templates/ws-scheduler-serviceaccount.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ authProviders: []
# settingsUrl: "https://gitlab.com/-/profile/applications"
# description: ""
# icon: ""
workspaceScheduler: workspace-scheduler

components:

Expand Down Expand Up @@ -503,27 +502,6 @@ components:
enabled: true
imageName: "seccomp-profile-installer"

wsScheduler:
name: "ws-scheduler"
disabled: false
resources:
cpu: 100m
memory: 32Mi
schedulerName: "workspace-scheduler"
ratelimit:
# Limits the # of scheduling attempts (per second) to limit traffic to the k8s master.
maxRPS: 10
scaler:
enabled: false
maxGhostWorkspaces: 10
renewal:
interval: "5m"
percentage: 20
controller:
kind: "constant"
constant:
setpoint: 5

wsProxy:
name: "ws-proxy"
disabled: false
Expand Down
3 changes: 0 additions & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ flags:
components-ee-kedge-app:
paths:
- components/ee/kedge/
components-ee-ws-scheduler-app:
paths:
- components/ee/ws-scheduler/
components-gitpod-cli-app:
paths:
- components/gitpod-cli/
Expand Down
2 changes: 0 additions & 2 deletions components/BUILD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ packages:
- components/ee/db-sync:docker
- components/ee/kedge:docker
- components/ee/payment-endpoint:docker
- components/ee/ws-scheduler:docker
- components/gitpod-db:docker
- components/ide/code-desktop:docker
- components/ide/code-desktop:docker-insiders
Expand Down Expand Up @@ -91,7 +90,6 @@ packages:
- components/ee/db-sync:app
- components/ee/kedge:app
- components/ee/payment-endpoint:app
- components/ee/ws-scheduler:app
- components/image-builder-mk3:app
- components/openvsx-proxy:app
- components/registry-facade:app
Expand Down
2 changes: 0 additions & 2 deletions components/common-go/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

package kubernetes

// wsman and ws-scheduler need to share labels/annotations so that we can have consistent logging and tracing.
//
// Those two are the only cases where you would actually need this package. If you think you need this elsewhere,
// please make sure you're not better of using wsman's API to solve your problem. If this is actually what you need,
// please update this comment.
Expand Down
1 change: 0 additions & 1 deletion components/ee/ws-scheduler/.gitignore

This file was deleted.

Loading

0 comments on commit 82d786e

Please sign in to comment.