fix(pg): default resources format (#432)

SocialGouv · Oct 16, 2023 · b376b25 · b376b25
1 parent 5cefc50
commit b376b25
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
@@ -593,9 +593,9 @@ spec:
   imagePullPolicy: IfNotPresent
   resources:
     limits:
-      memory: 1Gb
+      memory: 1G
     requests:
-      memory: 128Mb
+      memory: 128M
   storage:
     size: 8Gi
     storageClass: csi-cinder-high-speed
@@ -666,9 +666,9 @@ spec:
   imagePullPolicy: IfNotPresent
   resources:
     limits:
-      memory: 1Gb
+      memory: 1G
     requests:
-      memory: 128Mb
+      memory: 128M
   storage:
     size: 8Gi
     storageClass: csi-cinder-high-speed

diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
@@ -756,9 +756,9 @@ spec:
   imagePullPolicy: IfNotPresent
   resources:
     limits:
-      memory: 1Gb
+      memory: 1G
     requests:
-      memory: 128Mb
+      memory: 128M
   storage:
     size: 8Gi
     storageClass: managed-csi
@@ -848,9 +848,9 @@ spec:
   imagePullPolicy: IfNotPresent
   resources:
     limits:
-      memory: 1Gb
+      memory: 1G
     requests:
-      memory: 128Mb
+      memory: 128M
   storage:
     size: 8Gi
     storageClass: managed-csi

diff --git a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml
@@ -350,9 +350,9 @@ spec:
   imagePullPolicy: IfNotPresent
   resources:
     limits:
-      memory: 1Gb
+      memory: 1G
     requests:
-      memory: 128Mb
+      memory: 128M
   storage:
     size: 8Gi
     storageClass: csi-cinder-high-speed

diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml
@@ -514,7 +514,7 @@ spec:
   imagePullPolicy: IfNotPresent
   resources:
     limits:
-      memory: 1Gb
+      memory: 1G
     requests:
       memory: 42Mb
   storage:

diff --git a/plugins/fabrique/charts/pg/values.yaml b/plugins/fabrique/charts/pg/values.yaml
@@ -45,10 +45,10 @@ 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) `128Mb` }}"
+      ~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) `128M` }}"
     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) `1Gb` }}"
-      
+      ~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` }}"
+
   backup:
     ~tpl~enabled: "{{ (or .Values.Parent.backup.enabled .Values.global.isProd .Values.global.isPreProd) | ternary `true` `false` }}"
     schedule: "0 0 0 * * *" # daily