Remove ws-scheduler and custom schedulerName

.gitignore

@@ -49,7 +49,6 @@ venv/
 charts/gitpod_io/secrets/decrypted
 
 # Build artifacts
-components/ws-scheduler/ws-scheduler
 components/ws-proxy/ws-proxy
 
 # Logs

.werft/util/kubectl.ts

@@ -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")

WORKSPACE.yaml

@@ -22,9 +22,6 @@ defaultVariant:
 
 variants:
 - name: oss
-  components:
-    exclude:
-      - components/ee/ws-scheduler
   srcs:
     exclude:
     - "**/ee"

chart/templates/ws-manager-configmap.yaml

@@ -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 }}

chart/templates/ws-manager-tlssecret.yaml

@@ -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 }}
 

chart/values.yaml

@@ -97,7 +97,6 @@ authProviders: []
 #     settingsUrl: "https://gitlab.com/-/profile/applications"
 #   description: ""
 #   icon: ""
-workspaceScheduler: workspace-scheduler
 
 components:
 
@@ -500,27 +499,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

codecov.yml

@@ -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/

components/BUILD.yaml

@@ -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
@@ -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

components/common-go/kubernetes/kubernetes.go

@@ -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.