From bf4346a7d64ae5ef3165406e05025ab76369bdad Mon Sep 17 00:00:00 2001 From: Martial Maillot Date: Tue, 15 Oct 2024 16:18:30 +0200 Subject: [PATCH] increase ressources --- .kontinuous/env/dev/values.yaml | 22 --------------------- .kontinuous/templates/ingester.cronjob.yaml | 5 ++++- .kontinuous/templates/ingester.job.tpl | 7 ------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml index d9c67d9fb..83f194126 100644 --- a/.kontinuous/env/dev/values.yaml +++ b/.kontinuous/env/dev/values.yaml @@ -18,15 +18,6 @@ hasura: match: kind: Deployment value: true - autoscale: - enabled: true - resources: - limits: - cpu: "1000m" - memory: "1.5Gi" - requests: - cpu: "500m" - memory: "1Gi" envFrom: - secretRef: name: pg-app @@ -37,13 +28,6 @@ hasura: export: replicas: 1 - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1500m" - memory: "2Gi" env: - name: "BRANCH_NAME_SLUG" value: "{{.Values.global.branchSlug32}}" @@ -56,12 +40,6 @@ pg: kind: Cluster value: true cnpg-cluster: - resources: - requests: - memory: 1Gi - limits: - cpu: "1" - memory: 1Gi backup: # don't enable backup because we would need a new path each time as the cluster is recreated ~tpl~enabled: "false" diff --git a/.kontinuous/templates/ingester.cronjob.yaml b/.kontinuous/templates/ingester.cronjob.yaml index 19a40da61..081a898c3 100644 --- a/.kontinuous/templates/ingester.cronjob.yaml +++ b/.kontinuous/templates/ingester.cronjob.yaml @@ -2,10 +2,13 @@ apiVersion: batch/v1 kind: CronJob metadata: name: cron-ingester + annotations: + oblik.socialgouv.io/min-request-cpu: 1500m + oblik.socialgouv.io/min-request-memory: 3Gi spec: concurrencyPolicy: Forbid successfulJobsHistoryLimit: 3 failedJobsHistoryLimit: 3 schedule: 0 1 * * * jobTemplate: - {{- include "job.ingester" . | nindent 4 }} + { { - include "job.ingester" . | nindent 4 } } diff --git a/.kontinuous/templates/ingester.job.tpl b/.kontinuous/templates/ingester.job.tpl index 9c1c0237b..76f590002 100644 --- a/.kontinuous/templates/ingester.job.tpl +++ b/.kontinuous/templates/ingester.job.tpl @@ -11,13 +11,6 @@ spec: containers: - name: update-ingester image: "{{ or .Values.registry .Values.global.registry }}/{{ .Values.global.imageProject }}/{{ .Values.global.imageRepository }}/ingester:{{ .Values.global.imageTag }}" - resources: - requests: - cpu: 1500m - memory: 2.5Gi - limits: - cpu: 2000m - memory: 3Gi workingDir: /app env: - name: PRODUCTION