Merge pull request #2 from pavel-jancik/templating

feat(helm): Adding support for helm templates in some values
pavel-jancik · Apr 12, 2023 · e6af3f2 · e6af3f2
2 parents f86a53b + 8e0666d
commit e6af3f2
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/helm/postgres/Chart.yaml b/helm/postgres/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: postgrescluster
 description: A Helm chart for Kubernetes
 type: application
-# The version below should match the version on the PostgresCluster CRD
-version: 5.3.1
+# This version has to be increased via any change of the helm chart (e.g., comment in default values or templates)
+version: 5.3.2
 appVersion: 5.3.1
diff --git a/helm/postgres/templates/postgres.yaml b/helm/postgres/templates/postgres.yaml
@@ -15,7 +15,7 @@ spec:
   {{- end }}
   {{- if .Values.instances }}
   instances:
-{{ toYaml .Values.instances | indent 4 }}
+{{ tpl (.Values.instances | toYaml) . | indent 4 }}
   {{- else }}
   instances:
     - name: {{ default "instance1" .Values.instanceName | quote }}
@@ -42,7 +42,7 @@ spec:
       image: {{ .Values.imagePgBackRest | quote }}
       {{- end }}
       {{- if .Values.pgBackRestConfig }}
-{{ toYaml .Values.pgBackRestConfig | indent 6 }}
+{{ tpl (.Values.pgBackRestConfig | toYaml) . | indent 6 }}
       {{- else if .Values.multiBackupRepos }}
       configuration:
       - secret:

diff --git a/helm/postgres/values.yaml b/helm/postgres/values.yaml
@@ -15,7 +15,7 @@
 # available as one of the "RELATED_IMAGE_POSTGRES_..." images as part of the PGO
 # installation if you want to deploy the image without setting the "postgres"
 # image variable. This value is required.
-postgresVersion: 14
+postgresVersion: 15
 
 # postGISVersion if sets and coupled with a PostGIS enabled container, enables
 # PostGIS. This version number needs to be available as one of the
@@ -47,7 +47,7 @@ postgresVersion: 14
 # below value. "postgresVersion" needs to match the version of Postgres that is
 # used here. If using the GIS-enabled Postgres image, you need to ensure
 # "postGISVersion" matches the version of PostGIS used.
-# imagePostgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
+# imagePostgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
 
 # imagePgBackRest is the pgBackRest backup utility image. This defaults to the
 # below value.

diff --git a/kustomize/azure/postgres.yaml b/kustomize/azure/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo-azure
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - dataVolumeClaimSpec:
         accessModes:

diff --git a/kustomize/certmanager/postgres/postgres.yaml b/kustomize/certmanager/postgres/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   customReplicationTLSSecret:
     name: hippo-repl-tls
   customTLSSecret:

diff --git a/kustomize/gcs/postgres.yaml b/kustomize/gcs/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo-gcs
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - dataVolumeClaimSpec:
         accessModes:

diff --git a/kustomize/high-availability/ha-postgres.yaml b/kustomize/high-availability/ha-postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo-ha
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - name: pgha1
       replicas: 2

diff --git a/kustomize/keycloak/postgres.yaml b/kustomize/keycloak/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: keycloakdb
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - replicas: 2
       dataVolumeClaimSpec:

diff --git a/kustomize/multi-backup-repo/postgres.yaml b/kustomize/multi-backup-repo/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo-multi-repo
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - dataVolumeClaimSpec:
         accessModes:

diff --git a/kustomize/postgres/postgres.yaml b/kustomize/postgres/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - name: instance1
       dataVolumeClaimSpec:

diff --git a/kustomize/s3/postgres.yaml b/kustomize/s3/postgres.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: hippo-s3
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0
-  postgresVersion: 14
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
+  postgresVersion: 15
   instances:
     - dataVolumeClaimSpec:
         accessModes: