diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml index c84451be2..edba2986c 100644 --- a/.kontinuous/env/dev/values.yaml +++ b/.kontinuous/env/dev/values.yaml @@ -25,34 +25,11 @@ hasura: name: hasura - secretRef: name: hasura - replicas: 2 - # Retirer le commentaire des lignes ci-dessous pour utiliser l'export dans une branche dev /!\ Penser à remettre le commentaire avant de merger la branche dans master - # resources: - # limits: - # cpu: "2000m" - # memory: "4Gi" - # requests: - # cpu: "1000m" - # memory: "1Gi" export: env: - name: "BRANCH_NAME_SLUG" value: "{{.Values.global.branchSlug32}}" - resources: - # Pour exporter les données avec le glossaire et les vecteurs, il faut modifier les valeurs des ressources comme ceci: - # limits: - # cpu: "2000m" - # memory: "4Gi" - # requests: - # cpu: "1000m" - # memory: "1Gi" - limits: - cpu: "1000m" - memory: "1024Mi" - requests: - cpu: "1000m" - memory: "896Mi" pg: ~chart: pg diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml index c8e6dd053..c1bb46caa 100644 --- a/.kontinuous/values.yaml +++ b/.kontinuous/values.yaml @@ -57,14 +57,6 @@ www: env: - name: NEXTAUTH_URL value: https://www-{{.Values.global.host}} - resources: - limits: - cpu: "100m" - memory: "256Mi" - requests: - cpu: "50m" - memory: "128Mi" - replicas: 1 securityContext: fsGroup: 1000 runAsUser: 1000 @@ -85,18 +77,15 @@ export: name: export-elasticsearch - secretRef: name: s3 - resources: - limits: - cpu: "100m" - memory: 256Mi - requests: - cpu: "50m" - memory: 128Mi - replicas: 1 securityContext: fsGroup: 1000 runAsUser: 1000 runAsGroup: 1000 + annotations: + oblik.socialgouv.io/min-request-cpu: "1500m" + oblik.socialgouv.io/min-request-memory: "2Gi" + oblik.socialgouv.io/min-limit-cpu: "2000m" + oblik.socialgouv.io/min-limit-memory: "4Gi" hasura: ~chart: hasura @@ -111,18 +100,15 @@ hasura: name: hasura - secretRef: name: hasura - replicas: 2 - resources: - limits: - cpu: "2000m" - memory: "4Gi" - requests: - cpu: "50m" - memory: 650Mi securityContext: fsGroup: 1001 runAsUser: 1001 runAsGroup: 1001 + annotations: + oblik.socialgouv.io/min-request-cpu: "1000m" + oblik.socialgouv.io/min-request-memory: "1Gi" + oblik.socialgouv.io/min-limit-cpu: "2000m" + oblik.socialgouv.io/min-limit-memory: "4Gi" deactivate: jobs-deactivate: