From 737220843f0ca35c1c2465d92163370ace9947db Mon Sep 17 00:00:00 2001 From: Chris Geer Date: Wed, 30 Jun 2021 12:18:06 -0400 Subject: [PATCH 1/2] Added ability to define a PVC Storage Class for DB --- resources/datawarehouse/postgresql.yml | 3 +++ resources/pgadmin4/pgadmin4.yml | 3 +++ resources/postgresql/postgresql.yml | 3 +++ resources/sso/keycloak-cr.yml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/resources/datawarehouse/postgresql.yml b/resources/datawarehouse/postgresql.yml index e0117e8..e133664 100644 --- a/resources/datawarehouse/postgresql.yml +++ b/resources/datawarehouse/postgresql.yml @@ -30,6 +30,9 @@ items: labels: app: {{ dw_postgresql_application_name }} spec: +{% if postgresql_storage_class %} + storageClassName: {{ postgresql_storage_class }} +{% endif %} accessModes: - ReadWriteOnce resources: diff --git a/resources/pgadmin4/pgadmin4.yml b/resources/pgadmin4/pgadmin4.yml index 94fd4c6..e1188f0 100644 --- a/resources/pgadmin4/pgadmin4.yml +++ b/resources/pgadmin4/pgadmin4.yml @@ -93,6 +93,9 @@ items: spec: accessModes: - ReadWriteOnce +{% if postgresql_storage_class %} + storageClassName: {{ postgresql_storage_class }} +{% endif %} resources: requests: storage: 1Gi \ No newline at end of file diff --git a/resources/postgresql/postgresql.yml b/resources/postgresql/postgresql.yml index a6563ab..d454836 100644 --- a/resources/postgresql/postgresql.yml +++ b/resources/postgresql/postgresql.yml @@ -30,6 +30,9 @@ items: labels: app: {{ postgresql_application_name }} spec: +{% if postgresql_storage_class %} + storageClassName: {{ postgresql_storage_class }} +{% endif %} accessModes: - ReadWriteOnce resources: diff --git a/resources/sso/keycloak-cr.yml b/resources/sso/keycloak-cr.yml index 6e57463..0985076 100644 --- a/resources/sso/keycloak-cr.yml +++ b/resources/sso/keycloak-cr.yml @@ -12,3 +12,6 @@ spec: externalAccess: enabled: False profile: RHSSO +{% if keycloak_storage_class %} + storageClassName: {{ keycloak_storage_class }} +{% endif %} \ No newline at end of file From 7902b0b94893c8ca0b041d2ce892959b4bfe957d Mon Sep 17 00:00:00 2001 From: Chris Geer Date: Wed, 30 Jun 2021 17:31:42 -0400 Subject: [PATCH 2/2] Updated image to a valid image for pgadmin4 --- roles/openshift_pgadmin4/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openshift_pgadmin4/defaults/main.yml b/roles/openshift_pgadmin4/defaults/main.yml index 509ce78..3a7e937 100644 --- a/roles/openshift_pgadmin4/defaults/main.yml +++ b/roles/openshift_pgadmin4/defaults/main.yml @@ -4,7 +4,7 @@ application_name: pgadmin4 pgadmin4_template: "{{ resources_dir }}/pgadmin4.yml" -pgadmin4_image: crunchydata/crunchy-pgadmin4:centos7-12.3-4.3.2 +pgadmin4_image: crunchydata/crunchy-pgadmin4:centos8-13.3-4.6.3 resources_limits_cpu: 100m resources_limits_memory: 200Mi