Update gitpod configuration

Signed-off-by: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>

Author: aledbf

lib/charts/assets/gitpod-values.yaml

@@ -43,12 +43,13 @@ affinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
       - matchExpressions:
-        - key: purpose
+        - key: gitpod.io/workload_services
           operator: In
           values:
-          - services
+          - "true"
 
 db:
+  enabled: true
   host: "{{mysqlHostname}}"
   port: "{{mysqlPort}}"
   password: "{{mysqlPassword}}"
@@ -131,10 +132,10 @@ rabbitmq:
       requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
         - matchExpressions:
-          - key: purpose
+          - key: gitpod.io/workload_services
             operator: In
             values:
-            - services
+            - "true"
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
       - podAffinityTerm:
@@ -188,10 +189,10 @@ components:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
           - matchExpressions:
-            - key: purpose
+            - key: gitpod.io/workload_workspaces
               operator: In
               values:
-              - workspaces
+              - "true"
   server:
     defaultFeatureFlags: [] # ["full_workspace_backup"]
     imageName: server
@@ -218,9 +219,9 @@ components:
 
   workspace:
     affinity:
-      default: workspaces
-    supervisor:
-      imageName: supervisor
+      prebuild: "gitpod.io/workload_workspaces"
+      probe: "gitpod.io/workload_workspaces"
+      default: "gitpod.io/workload_workspaces"
     templates:
       default:
         spec:
@@ -286,10 +287,10 @@ components:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
           - matchExpressions:
-            - key: purpose
+            - key: gitpod.io/workload_workspaces
               operator: In
               values:
-              - workspaces
+              - "true"
 
   contentService:
     name: content-service
@@ -335,10 +336,10 @@ components:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
           - matchExpressions:
-            - key: purpose
+            - key: gitpod.io/workload_services
               operator: In
               values:
-              - services
+              - "true"
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
         - podAffinityTerm:
@@ -348,7 +349,7 @@ components:
                 operator: In
                 values:
                 - ws-proxy
-            topologyKey: services
+            topologyKey: "kubernetes.io/hostname"
           weight: 100
 
 # configure default log level

lib/charts/assets/ingress.yaml

@@ -15,6 +15,7 @@ metadata:
         }
       }
     alb.ingress.kubernetes.io/tags: Purpose=Gitpod,Service=proxy
+    alb.ingress.kubernetes.io/target-node-labels: gitpod.io/workload_workspaces=true
     alb.ingress.kubernetes.io/healthcheck-protocol: HTTPS
     alb.ingress.kubernetes.io/backend-protocol: HTTPS
     alb.ingress.kubernetes.io/scheme: internet-facing

lib/gitpod.ts

@@ -7,7 +7,7 @@ import { Registry } from './registry';
 import { importCluster } from './charts/cluster-utils';
 
 // TODO: switch to official gitpod.io build
-const version = "aledbf-retag.19";
+const version = "aledbf-retag.27";
 
 export interface GitpodProps extends cdk.StackProps {
     domain: string
@@ -47,7 +47,7 @@ export class GitpodStack extends cdk.Stack {
             release: 'gitpod',
             repository: 'https://aledbf.github.io/gitpod-chart-cleanup/',
             namespace: 'default',
-            version: '1.0.31',
+            version: '1.0.41',
             wait: true,
             values: loadYaml(doc),
         });