Upgrade gitpod chart

Signed-off-by: Manuel Alejandro de Brito Fontes <[email protected]>

Author: aledbf

lib/charts/assets/gitpod-values.yaml

@@ -10,7 +10,6 @@ certificatesSecret:
   secretName: proxy-config-certificates
 
 installPodSecurityPolicies: true
-imagePullPolicy: IfNotPresent
 
 resources:
   default:
@@ -42,11 +41,11 @@ affinity:
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
-      - matchExpressions:
-        - key: gitpod.io/workload_services
-          operator: In
-          values:
-          - "true"
+        - matchExpressions:
+            - key: gitpod.io/workload_services
+              operator: In
+              values:
+                - "true"
 
 db:
   enabled: true
@@ -66,7 +65,7 @@ minio:
 
 # configure docker-registry to use S3
 docker-registry:
-  replicas: 3
+  replicas: 2
   enabled: true
   fullnameOverride: registry
   # Enable TLS
@@ -106,8 +105,8 @@ docker-registry:
       debug:
         addr: :5001
         prometheus:
-            enabled: true
-            path: /metrics
+          enabled: true
+          path: /metrics
       secret: phirDEX1torsyumiwnnuh6PRAU4hern
       tls:
         certificate: /etc/ssl/docker/tls.crt
@@ -131,19 +130,19 @@ rabbitmq:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
-        - matchExpressions:
-          - key: gitpod.io/workload_services
-            operator: In
-            values:
-            - "true"
+          - matchExpressions:
+              - key: gitpod.io/workload_services
+                operator: In
+                values:
+                  - "true"
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
-      - podAffinityTerm:
-          labelSelector:
-            matchLabels:
-              app.kubernetes.io/name: rabbitmq
-          topologyKey: kubernetes.io/hostname
-        weight: 1
+        - podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app.kubernetes.io/name: rabbitmq
+            topologyKey: kubernetes.io/hostname
+          weight: 1
   replicas: 2
   auth:
     username: "gitpod"
@@ -170,33 +169,21 @@ components:
   dbMigrations:
     enabled: false
 
-  imageBuilder:
-    dindImage: docker:20.10.7-dind-rootless
-    hostDindData: "/mnt/image-builder"
-    registry:
-      secretName: builtin-registry-auth
-      bypassProxy: true
-    dindResources:
-      requests:
-        cpu: 100m
-        memory: 256Mi
-
   registryFacade:
     hostname: "{{domain}}"
     daemonSet: true
     affinity:
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
-          - matchExpressions:
-            - key: gitpod.io/workload_workspaces
-              operator: In
-              values:
-              - "true"
+            - matchExpressions:
+                - key: gitpod.io/workload_workspaces
+                  operator: In
+                  values:
+                    - "true"
   server:
     defaultFeatureFlags: [] # ["full_workspace_backup"]
     imageName: server
-    replicas: 1
     github:
       app: {}
     enableLocalApp: false
@@ -205,17 +192,17 @@ components:
     blockNewUsers: false
     blockNewUsersPasslist: []
     makeNewUsersAdmin: false
-    sessionMaxAgeMs: "28800000"   # 8 hours
+    sessionMaxAgeMs: "28800000" # 8 hours
     defaultBaseImageRegistryWhitelist:
-    - "https://index.docker.io/v1/"
+      - "https://index.docker.io/v1/"
     incrementalPrebuilds:
       commitHistory: 100
       repositoryPasslist: []
     wsman: []
     serverContainer:
       env:
-      - name: ENABLE_PAYMENT
-        value: "false"
+        - name: ENABLE_PAYMENT
+          value: "false"
 
   workspace:
     affinity:
@@ -225,37 +212,54 @@ components:
     templates:
       default:
         spec:
-          dnsConfig:
-            nameservers:
-            - 1.1.1.1
-            - 8.8.8.8
-          dnsPolicy: None   # do NOT query against K8s DNS (https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
+          #dnsConfig:
+          #  nameservers:
+          #    - 1.1.1.1
+          #    - 8.8.8.8
+          #dnsPolicy: None # do NOT query against K8s DNS (https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
           env:
-          - name: THEIA_PREVENT_METADATA_ACCESS
-            value: true
+            - name: THEIA_PREVENT_METADATA_ACCESS
+              value: true
       regular:
         spec:
           containers:
-          - name: workspace
-            env:
-            - name: THEIA_RATELIMIT_LOG
-              value: "50"
+            - name: workspace
+              env:
+                - name: THEIA_RATELIMIT_LOG
+                  value: "50"
       prebuild:
         spec:
           containers:
-          - name: workspace
-            # Intended to reduce the density for prebuilds
-            resources:
-              limits:
-                cpu: "5"
-                memory: 12Gi
-              requests:
-                cpu: 1m
-                ephemeral-storage: 5Gi
-                memory: 4608Mi  # = 2 * 2304Mi
+            - name: workspace
+              # Intended to reduce the density for prebuilds
+              resources:
+                limits:
+                  cpu: "5"
+                  memory: 12Gi
+                requests:
+                  cpu: 1m
+                  ephemeral-storage: 5Gi
+                  memory: 4608Mi # = 2 * 2304Mi
+      imagebuild:
+        spec:
+          #dnsConfig:
+          #  nameservers:
+          #    - 10.100.0.10
+          #dnsPolicy: Default
+          containers:
+            - name: workspace
+              # Intended to reduce the density for prebuilds
+              resources:
+                limits:
+                  cpu: "5"
+                  memory: 12Gi
+                requests:
+                  cpu: 1m
+                  ephemeral-storage: 5Gi
+                  memory: 4608Mi # = 2 * 2304Mi
 
   proxy:
-    replicas: 4
+    replicas: 2
     ports:
       http:
         expose: true
@@ -280,17 +284,17 @@ components:
     containerRuntime:
       enabled: true
       nodeRoots:
-      - /var/lib
-      - /var/lib/containerd/io.containerd.runtime.v2.task/k8s.io
+        - /var/lib
+        - /var/lib/containerd/io.containerd.runtime.v2.task/k8s.io
     affinity:
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
-          - matchExpressions:
-            - key: gitpod.io/workload_workspaces
-              operator: In
-              values:
-              - "true"
+            - matchExpressions:
+                - key: gitpod.io/workload_workspaces
+                  operator: In
+                  values:
+                    - "true"
 
   contentService:
     name: content-service
@@ -325,7 +329,7 @@ components:
   wsProxy:
     name: ws-proxy
     disabled: false
-    replicas: 4
+    replicas: 2
     hostHeader: x-wsproxy-host
     ports:
       metrics:
@@ -335,22 +339,22 @@ components:
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
-          - matchExpressions:
-            - key: gitpod.io/workload_services
-              operator: In
-              values:
-              - "true"
+            - matchExpressions:
+                - key: gitpod.io/workload_services
+                  operator: In
+                  values:
+                    - "true"
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
-        - podAffinityTerm:
-            labelSelector:
-              matchExpressions:
-              - key: component
-                operator: In
-                values:
-                - ws-proxy
-            topologyKey: "kubernetes.io/hostname"
-          weight: 100
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                  - key: component
+                    operator: In
+                    values:
+                      - ws-proxy
+              topologyKey: "kubernetes.io/hostname"
+            weight: 100
 
 # configure default log level
 log:

lib/gitpod.ts

@@ -6,8 +6,8 @@ import { Database } from './database';
 import { Registry } from './registry';
 import { importCluster } from './charts/cluster-utils';
 
-// TODO: switch to official gitpod.io build
-const version = "aledbf-retag.27";
+// TODO: switch to official gitpod.io build.
+const version = "aledbf-mk3.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.42',
+            version: '1.2.13',
             wait: true,
             values: loadYaml(doc),
         });