fix: dedicated nodepool (#1465)

SocialGouv · Sep 9, 2024 · 7110107 · 7110107
1 parent 8a13847
commit 7110107
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -27,22 +27,10 @@ hasura:
         name: hasura
 
 export:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
   env:
     - name: "BRANCH_NAME_SLUG"
       value: "{{.Values.global.branchSlug32}}"
 
-www:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
-
 pg:
   ~chart: pg
   # force this PG cluster to be destroyed/recreated on redeploys

diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -37,23 +37,11 @@ hasura:
         name: hasura
 
 www:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
   host: cdtn-admin-preprod.ovh.fabrique.social.gouv.fr
   env:
     - name: NEXTAUTH_URL
       value: https://cdtn-admin-preprod.ovh.fabrique.social.gouv.fr
 
-export:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
-
 pg:
   ~chart: pg
   # force this PG cluster to be destroyed/recreated on redeploys

diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -22,11 +22,6 @@ www:
     requests:
       cpu: "100m"
       memory: "386Mi"
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
 
 export:
   replicas: 1
@@ -37,11 +32,6 @@ export:
     requests:
       cpu: "1500m"
       memory: "2Gi"
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
 
 hasura:
   autoscale:

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -61,6 +61,20 @@ www:
     fsGroup: 1000
     runAsUser: 1000
     runAsGroup: 1000
+  tolerations:
+    - key: startup
+      operator: Equal
+      value: cdtn
+      effect: NoSchedule
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: nodepool
+                operator: In
+                values:
+                  - cdtn-worker-nodepool
 
 export:
   ~chart: app
@@ -86,6 +100,20 @@ export:
     oblik.socialgouv.io/min-request-memory: "2Gi"
     oblik.socialgouv.io/min-limit-cpu: "2000m"
     oblik.socialgouv.io/min-limit-memory: "4Gi"
+  tolerations:
+    - key: startup
+      operator: Equal
+      value: cdtn
+      effect: NoSchedule
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: nodepool
+                operator: In
+                values:
+                  - cdtn-worker-nodepool
 
 hasura:
   ~chart: hasura