From cf80ab644f6bfead455f86ef99b0ce8e37b3dd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9o=20M=C3=A9vollon?= Date: Thu, 11 Jul 2024 17:12:54 +0200 Subject: [PATCH 1/2] fix: export ingress --- .kontinuous/values.yaml | 58 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml index d28bdd3537..b114fb9ca3 100644 --- a/.kontinuous/values.yaml +++ b/.kontinuous/values.yaml @@ -1,7 +1,7 @@ global: pgSecretName: pg-app -backend: &backend +backend: ~chart: app ~needs: [backend-cron] imagePackage: backend @@ -56,9 +56,61 @@ backend: &backend runAsGroup: 1000 backend-export: - <<: *backend - ~needs: [build-backend] + # duplicate keys ~chart: app + imagePackage: backend + host: "api-{{ .Values.global.host }}" + probesPath: /healthz + containerPort: 3000 + resources: + requests: + cpu: 0.3 + memory: 512Mi + limits: # exports need a lot of CPU/RAM ATM + cpu: 3 + memory: 3Gi + startupProbe: + initialDelaySeconds: 30 + failureThreshold: 50 + periodSeconds: 10 + livenessProbe: + failureThreshold: 20 + httpGet: + path: /healthz + port: http + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 10 + envFrom: + - secretRef: + name: "{{ .Values.global.pgSecretName }}" + - secretRef: + name: backend-sealed-secret + - configMapRef: + name: backend-configmap + - secretRef: + name: domifa-encryption-key + vars: &backendVars + TZ: Europe/Paris + POSTGRES_HOST: "$(PGHOST)" + POSTGRES_USERNAME: "$(PGUSER)" + POSTGRES_PASSWORD: "$(PGPASSWORD)" + POSTGRES_DATABASE: "$(PGDATABASE)" + POSTGRES_PORT: "$(PGPORT)" + DOMIFA_BACKEND_URL: "https://api-{{ .Values.global.host }}/" + DOMIFA_FRONTEND_URL: "https://{{ .Values.global.host }}/" + DOMIFA_PORTAIL_USAGERS_URL: "https://mon-{{ .Values.global.host }}/" + DOMIFA_PORTAIL_ADMINS_URL: "https://admin-{{ .Values.global.host }}/" + DOMIFA_CRON_ENABLED: "false" + securityContext: + fsGroup: 1000 + runAsUser: 1000 + runAsGroup: 1000 + + # new keys + ~needs: [build-backend] ingress: paths: - /export From 63177b495a5fa5778fee0b2960077e26471b6100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9o=20M=C3=A9vollon?= Date: Thu, 11 Jul 2024 17:24:15 +0200 Subject: [PATCH 2/2] fix: needs --- .kontinuous/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml index b114fb9ca3..6a7eddbd06 100644 --- a/.kontinuous/values.yaml +++ b/.kontinuous/values.yaml @@ -58,6 +58,7 @@ backend: backend-export: # duplicate keys ~chart: app + ~needs: [backend-cron] imagePackage: backend host: "api-{{ .Values.global.host }}" probesPath: /healthz @@ -110,7 +111,6 @@ backend-export: runAsGroup: 1000 # new keys - ~needs: [build-backend] ingress: paths: - /export