fix(kontinuous): add oblik to preprod, change limit for nginx

SocialGouv · Jan 21, 2025 · a38f64e · a38f64e
2 parents b7a1c36 + 77471d1
commit a38f64e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -1,18 +1,13 @@
 backend: &backendPreprod
   annotations:
-    oblik.socialgouv.io/min-request-cpu: 500m
+    oblik.socialgouv.io/min-limit-cpu: "3"
+    oblik.socialgouv.io/min-request-cpu: "1"
+    oblik.socialgouv.io/min-request-memory: "3Gi"
   host: "api-{{ .Values.global.host }}"
   ~needs: [build-backend]
   autoscale:
     minReplicas: 1
     maxReplicas: 3
-  resources:
-    requests:
-      cpu: 1
-      memory: 1Gi
-    limits: # exports need a lot of CPU/RAM ATM
-      cpu: 3
-      memory: 3Gi
   envFrom:
     - secretRef:
         name: "{{ .Values.global.pgSecretName }}"
@@ -54,6 +49,10 @@ backend: &backendPreprod
 backend-export:
   <<: *backendPreprod
   ~needs: [build-backend]
+  annotations:
+    oblik.socialgouv.io/min-request-cpu: "2"
+    oblik.socialgouv.io/min-request-memory: 3Gi
+    oblik.socialgouv.io/request-apply-target: peak
   ingress:
     paths:
       - /export

diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -114,6 +114,10 @@ backend: &backendProd
 backend-export:
   ~needs: [build-backend]
   host: "domifa-api.{{ .Values.global.domain }}"
+  # annotations:
+  #   oblik.socialgouv.io/min-request-cpu: "2"
+  #   oblik.socialgouv.io/min-request-memory: 3Gi
+  #   oblik.socialgouv.io/request-apply-target: peak
   autoscale:
     minReplicas: 2
     maxReplicas: 5

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -67,6 +67,14 @@ backend-export:
   host: "api-{{ .Values.global.host }}"
   probesPath: /healthz
   containerPort: 3000
+  ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-body-size: 64m
+      nginx.ingress.kubernetes.io/proxy-connect-timeout: "30"
+      nginx.ingress.kubernetes.io/proxy-keepalive-requests: "100"
+      nginx.ingress.kubernetes.io/proxy-keepalive-timeout: "600"
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "1800"
+      nginx.ingress.kubernetes.io/proxy-send-timeout: "1800"
   resources:
     requests:
       cpu: 0.3