From 2b6f4615229feffc1cecb6ebb560fca94f68c298 Mon Sep 17 00:00:00 2001 From: ArnaudTa <33383276+ArnaudTA@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:25:10 +0200 Subject: [PATCH] fix: :art: variabilize postgres clusters pvc size --- roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 | 2 +- roles/socle-config/files/config.yaml | 2 ++ roles/socle-config/files/crd-conf-dso.yaml | 6 ++++++ roles/sonarqube/templates/pg-cluster-sonar.yaml.j2 | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 b/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 index fa9bac93..ffface43 100644 --- a/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 +++ b/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 @@ -31,4 +31,4 @@ spec: # Require 1Gi of space per instance using default storage class storage: - size: 1Gi + size: {{ dsc.keycloak.postgresPvcSize }} diff --git a/roles/socle-config/files/config.yaml b/roles/socle-config/files/config.yaml index d726df83..d5d7cdbf 100644 --- a/roles/socle-config/files/config.yaml +++ b/roles/socle-config/files/config.yaml @@ -26,9 +26,11 @@ spec: keycloak: namespace: dso-keycloak subDomain: keycloak + postgresPvcSize: 1Gi sonarqube: namespace: dso-sonarqube subDomain: sonar + postgresPvcSize: 5Gi vault: namespace: dso-vault subDomain: vault diff --git a/roles/socle-config/files/crd-conf-dso.yaml b/roles/socle-config/files/crd-conf-dso.yaml index f8b755fe..5edf1e1d 100644 --- a/roles/socle-config/files/crd-conf-dso.yaml +++ b/roles/socle-config/files/crd-conf-dso.yaml @@ -367,6 +367,9 @@ spec: chartVersion: description: Keycloak chart version (e.g., "16.0.3"). type: string + postgresPvcSize: + description: Size for postgres' pvc + type: string values: description: | You can merge customs values for keycloak, they will be merged with roles/keycloak/templates/values.j2 @@ -443,6 +446,9 @@ spec: chartVersion: description: SonarQube Bitnami helm chart version (e.g., "3.2.10"). type: string + postgresPvcSize: + description: Size for postgres' pvc + type: string values: description: | You can merge customs values for sonarqube, it will be merged with roles/sonarqube/tasks/main.yaml diff --git a/roles/sonarqube/templates/pg-cluster-sonar.yaml.j2 b/roles/sonarqube/templates/pg-cluster-sonar.yaml.j2 index 5dbc4f0c..66ada909 100644 --- a/roles/sonarqube/templates/pg-cluster-sonar.yaml.j2 +++ b/roles/sonarqube/templates/pg-cluster-sonar.yaml.j2 @@ -31,5 +31,5 @@ spec: # Require 1Gi of space per instance using default storage class storage: - size: 5Gi + size: {{ dsc.sonarqube.postgresPvcSize }}