From 4e09b2126bc95db7bf8ff27f481704869ab1bf50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=A9o=20M=C3=A9vollon?=
 <38255502+matmut7@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:29:05 +0200
Subject: [PATCH] fix: dedicated nodepool (#6106)

---
 .kontinuous/env/dev/values.yaml     |  5 -----
 .kontinuous/env/preprod/values.yaml |  7 -------
 .kontinuous/env/prod/values.yaml    |  5 -----
 .kontinuous/values.yaml             | 17 ++++++++++++++++-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
index b6d0034ed9..4592decae4 100644
--- a/.kontinuous/env/dev/values.yaml
+++ b/.kontinuous/env/dev/values.yaml
@@ -34,11 +34,6 @@ jobs:
             secretKey: ELASTICSEARCH_URL
 
 app:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
   env:
     - name: "NEXT_PUBLIC_BRANCH_NAME_SLUG"
       value: "{{.Values.global.branchSlug32}}"
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
index 3fcba9fda2..6631fbaeb9 100644
--- a/.kontinuous/env/preprod/values.yaml
+++ b/.kontinuous/env/preprod/values.yaml
@@ -1,10 +1,3 @@
-app:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
-
 jobs:
   runs:
     build-app:
diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
index 3bfb5666f9..e2cc3dbe6c 100644
--- a/.kontinuous/env/prod/values.yaml
+++ b/.kontinuous/env/prod/values.yaml
@@ -49,8 +49,3 @@ app:
       oblik.socialgouv.io/min-request-memory: 1280Mi
       oblik.socialgouv.io/min-limit-cpu: 900m
       oblik.socialgouv.io/min-limit-memory: 1536Mi
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
index 2f2761d17a..ac569f3b09 100644
--- a/.kontinuous/values.yaml
+++ b/.kontinuous/values.yaml
@@ -43,7 +43,8 @@ app:
       name: next
   initContainers:
     - name: copy-next
-      image: "{{ .Values.global.registry }}/{{ .Values.global.projectName }}/{{
+      image:
+        "{{ .Values.global.registry }}/{{ .Values.global.projectName }}/{{
         .Values.global.imageRepository }}/app:{{ .Values.global.imageTag }}"
       command: ["/bin/sh", "-c"]
       args:
@@ -51,3 +52,17 @@ app:
       volumeMounts:
         - name: next
           mountPath: /mnt/next
+  tolerations:
+    - key: startup
+      operator: Equal
+      value: cdtn
+      effect: NoSchedule
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: nodepool
+                operator: In
+                values:
+                  - cdtn-worker-nodepool