fix: dedicated nodepool (#6106)

SocialGouv · Sep 9, 2024 · 4e09b21 · 4e09b21
1 parent cb9bd55
commit 4e09b21
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -43,11 +43,26 @@ 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:
         - cp -r /app/packages/code-du-travail-frontend/.next/* /mnt/next;
       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