changed nodeAffinity for preview-environments

.werft/build.ts

@@ -9,6 +9,7 @@ import * as semver from 'semver';
 import * as util from 'util';
 import { sleep } from './util/util';
 import * as gpctl from './util/gpctl';
+import { createHash } from "crypto";
 
 const readDir = util.promisify(fs.readdir)
 
@@ -396,6 +397,12 @@ export async function deployToDev(deploymentConfig: DeploymentConfig, workspaceF
         let flags = commonFlags
         flags += ` --set components.wsDaemon.servicePort=${wsdaemonPortMeta}`;
         flags += ` --set components.registryFacade.ports.registry.servicePort=${registryNodePortMeta}`;
+
+        const nodeAffinityValues = [
+            "values.nodeAffinities_0.yaml",
+            "values.nodeAffinities_1.yaml"
+        ]
+
         if (k3sWsCluster) {
             // we do not need meta cluster ws components when k3s ws is enabled
             // TODO: Add flags to disable ws component in the meta cluster
@@ -406,8 +413,15 @@ export async function deployToDev(deploymentConfig: DeploymentConfig, workspaceF
             flags += ` -f ../.werft/values.dev.gcp-storage.yaml`;
         }
 
+        /*  A hash is caclulated from the branch name and a subset of that string is parsed to a number x,
+            x mod the number of different nodepool-sets defined in the files listed in nodeAffinityValues
+            is used to generate a pseudo-random number that consistent as long as the branchname persists.
+            We use it to reduce the number of preview-environments accumulating on a singe nodepool.
+         */
+        const nodepoolIndex = parseInt(createHash('sha256').update(namespace).digest('hex').substring(0,5),16) % nodeAffinityValues.length;
+
         exec(`helm dependencies up`);
-        exec(`/usr/local/bin/helm3 upgrade --install --timeout 10m -f ../.werft/values.dev.yaml ${flags} ${helmInstallName} .`);
+        exec(`/usr/local/bin/helm3 upgrade --install --timeout 10m -f ../.werft/${nodeAffinityValues[nodepoolIndex]} -f ../.werft/values.dev.yaml ${flags} ${helmInstallName} .`);
         exec(`kubectl apply -f ../.werft/jaeger.yaml`);
 
         werft.log('helm', 'installing Sweeper');

.werft/jaeger.yaml

@@ -33,11 +33,9 @@ spec:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
-          - matchExpressions:
-              - key: dev/workload
-                operator: In
-                values:
-                  - workload
+        - matchExpressions:
+          - key: workload/meta
+            operator: Exists
   strategy: allInOne
   storage:
     options:

.werft/values.dev.yaml

@@ -10,15 +10,7 @@ certificatesSecret:
   secretName: proxy-config-certificates
 version: not-set
 imagePullPolicy: Always
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: gitpod.io/workload_meta
-          operator: In
-          values:
-          - "true"
+
 authProviders: []
 tracing:
   endoint: http://jaeger-collector:14268/api/traces
@@ -78,8 +70,6 @@ components:
     # configure GCP registry
     pullSecret:
       secretName: gcp-sa-registry-auth
-    affinity:
-      default: "gitpod.io/workload_workspace"
     templates:
       default:
         spec:
@@ -217,16 +207,6 @@ minio:
   serviceAccount:
     name: ws-daemon
     create: false
-  # make sure the pod ends up where it's supposed to stay
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: dev/workload
-            operator: In
-            values:
-            - "workload"
   resources:
     requests:
       # in preview envs, we want deployments to push scale-up early
@@ -235,15 +215,6 @@ minio:
 mysql:
   primary:
     # make sure the pod ends up where it's supposed to stay
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: dev/workload
-              operator: In
-              values:
-              - "workload"
     resources:
       requests:
         # in preview envs, we want deployments to push scale-up early
@@ -258,15 +229,6 @@ rabbitmq:
     username: override-me
     password: override-me
   # make sure the pod ends up where it's supposed to stay
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: dev/workload
-            operator: In
-            values:
-            - "workload"
   resources:
     requests:
       # in preview envs, we want deployments to push scale-up early

.werft/values.k3sWsCluster.yaml

@@ -10,15 +10,6 @@ certificatesSecret:
   secretName: proxy-config-certificates
 version: not-set
 imagePullPolicy: Always
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: gitpod.io/workload_services
-          operator: In
-          values:
-          - "true"
 authProviders: []
 tracing:
   endoint: http://jaeger-collector:14268/api/traces

.werft/values.nodeAffinities_0.yaml

@@ -0,0 +1,62 @@
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: workload/meta
+          operator: Exists
+
+components:
+
+  wsDaemon:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: gitpod.io/workspace_0
+              operator: Exists
+
+  registryFacade:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: gitpod.io/workspace_0
+              operator: Exists
+
+
+  workspace:
+    affinity:
+      default: gitpod.io/workspace_0
+
+# Sub-Charts
+
+rabbitmq:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: workload/meta
+            operator: Exists
+
+mysql:
+  primary:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: workload/meta
+              operator: Exists
+
+minio:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: workload/meta
+            operator: Exists

.werft/values.nodeAffinities_1.yaml

@@ -0,0 +1,62 @@
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: workload/meta
+          operator: Exists
+
+components:
+
+  wsDaemon:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: gitpod.io/workspace_1
+              operator: Exists
+
+  registryFacade:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: gitpod.io/workspace_1
+              operator: Exists
+
+
+  workspace:
+    affinity:
+      default: gitpod.io/workspace_1
+
+# Sub-Charts
+
+rabbitmq:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: workload/meta
+            operator: Exists
+
+mysql:
+  primary:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: workload/meta
+              operator: Exists
+
+minio:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: workload/meta
+            operator: Exists