From 9c0ff8d9f32af09ace8a1e8fc9d0d29b6b066a6d Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Wed, 20 Dec 2023 15:29:47 +0100 Subject: [PATCH] fix: use default memory requests=limits for prod cnpg (#454) --- packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml | 4 ++-- plugins/fabrique/charts/pg/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml index a5189106ed..10fb9d3ce9 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml @@ -758,7 +758,7 @@ spec: limits: memory: 1G requests: - memory: 512M + memory: 1G storage: size: 8Gi storageClass: managed-csi @@ -852,7 +852,7 @@ spec: limits: memory: 1G requests: - memory: 512M + memory: 1G storage: size: 8Gi storageClass: managed-csi diff --git a/plugins/fabrique/charts/pg/values.yaml b/plugins/fabrique/charts/pg/values.yaml index 5aaa77e09f..e16aab65b3 100644 --- a/plugins/fabrique/charts/pg/values.yaml +++ b/plugins/fabrique/charts/pg/values.yaml @@ -47,7 +47,7 @@ cnpg-cluster: resources: requests: - ~tpl~memory: "{{ or (and .Values.Parent._ProjectValues (index .Values.Parent._ProjectValues `cnpg-cluster`).resources (index .Values.Parent._ProjectValues `cnpg-cluster`).resources.requests (index .Values.Parent._ProjectValues `cnpg-cluster`).resources.requests.memory) `512M` }}" + ~tpl~memory: "{{ or (and .Values.Parent._ProjectValues (index .Values.Parent._ProjectValues `cnpg-cluster`).resources (index .Values.Parent._ProjectValues `cnpg-cluster`).resources.requests (index .Values.Parent._ProjectValues `cnpg-cluster`).resources.requests.memory) (.Values.global.isProd | ternary `1G` `512M`) }}" limits: ~tpl~memory: "{{ or (and .Values.Parent._ProjectValues (index .Values.Parent._ProjectValues `cnpg-cluster`).resources (index .Values.Parent._ProjectValues `cnpg-cluster`).resources.limits (index .Values.Parent._ProjectValues `cnpg-cluster`).resources.limits.memory) `1G` }}"