Commit 94814e4f authored by Jonathan S. Katz's avatar Jonathan S. Katz Committed by Jonathan S. Katz
Browse files

Move Postgres Helm chart to use defaults and requires 

This starts pushing the chart towards more acceptable conventions,
as well as greater usability.
parent 6bb5ee3c

helm/postgres/Chart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ apiVersion: v2 
name: postgrescluster

description: A Helm chart for Kubernetes

type: application

version: 0.1.0

version: 0.1.1

appVersion: 5.0.3

helm/postgres/templates/postgres.yaml

+5 −13
Original line number Diff line number Diff line 
apiVersion: postgres-operator.crunchydata.com/v1beta1

kind: PostgresCluster

metadata:

  name: {{ .Values.name }}

  name: {{ required "You must give your Postgres cluster a name" .Values.name }}

spec:

  image: {{ .Values.postgres }}

  postgresVersion: {{ .Values.postgresVersion }}

  image: {{ default "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:centos8-13.4-1" .Values.postgres | quote }}

  postgresVersion: {{ default 13 .Values.postgresVersion }}

  instances:

    - name: instance1

      dataVolumeClaimSpec:
@@ -15,7 +15,7 @@ spec: 
            storage: 1Gi

  backups:

    pgbackrest:

      image: {{ .Values.pgBackRest}}

      image: {{ default "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:centos8-2.35-0" .Values.pgBackRest | quote }}

      repos:

      - name: repo1

        volume:
@@ -25,14 +25,6 @@ spec: 
            resources:

              requests:

                storage: 1Gi

      - name: repo2

        volume:

          volumeClaimSpec:

            accessModes:

            - "ReadWriteOnce"

            resources:

              requests:

                storage: 1Gi

  proxy:

    pgBouncer:

      image: {{ .Values.pgBouncer}}
 
      image: {{ default "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:centos8-1.15-3" .Values.pgBouncer | quote}}

helm/postgres/values.yaml

+15 −8
Original line number Diff line number Diff line
@@ -2,11 +2,18 @@ 
# Cluster name

name: hippo



# PostgreSQL Version

# Version should match version defined in PostgreSQL images

postgresVersion: 13



# Images

postgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:centos8-13.4-1

pgBackRest: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:centos8-2.35-0

pgBouncer: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:centos8-1.15-3
 
# postgresVersion should match the version of Potsgres you are deploying from

# the image. This defaults to the below value.

# postgresVersion: 13



# postgres can be a Postgres or GIS-enabled Postgres image. This defaults to the

# below value

# postgres: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:centos8-13.4-1



# pgBackRest is the pgBackRest backup utility image. This defaults to the below

# value

# pgBackRest: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:centos8-2.35-0



# pgBouncer is the image for the PgBouncer connection pooler. This defaults to

# the below value

# pgBouncer: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:centos8-1.15-3