Make PostgresClusters API version default to v1 and postgres version

default to 18

Author: dsessler7

README.md

@@ -11,6 +11,8 @@ Each of the examples has its own README that guides you through the process of d
 The best way to get started is to fork this repository and experiment with the examples.
 The examples as provided are designed for the use of PGO along with Crunchy Data's Postgres distribution, Crunchy Postgres, as Crunchy Postgres for Kubernetes. For more information on the use of container images downloaded from the Crunchy Data Developer Portal or other third party sources, please see 'License and Terms' below.
 
+By default, these examples are set to use the `v1` version of the PostgresCluster API, which is only available in PGO v6. If you plan to use these examples with PGO v5, or want to use the older API with PGO v6, you will need to change the version suffix in the `apiVersion` of the PostgresCluster manifests to `v1beta1`.
+
 ### Help with the Examples
 
 * For general questions or community support, we welcome you to join our [community Discord](https://discord.gg/BnsMEeaPBV).

helm/postgres/Chart.yaml

@@ -3,5 +3,5 @@ name: postgrescluster
 description: A Helm chart for Kubernetes
 type: application
 # The version below should match the version on the PostgresCluster CRD
-version: 5.7.4
-appVersion: 5.7.4
+version: 6.0.0
+appVersion: 6.0.0

helm/postgres/templates/postgres.yaml

@@ -1,4 +1,4 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/{{required "You must set the PostgresCluster API version to deploy." .Values.apiVersion }}
 kind: PostgresCluster
 metadata:
 name: {{default .Release.Name .Values.name }}

helm/postgres/values.yaml

@@ -15,7 +15,13 @@
 # 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: 17
+postgresVersion: 18
+
+# apiVersion sets the PostgresCluster API version to use. When deploying a
+# PostgresCluster with PGO v6, you can use the newer v1 API version or the older
+# v1beta1. When deploying a PostgresCluster with PGO v5, you must use the older
+# PostgresCluster API version, v1beta1.
+apiVersion: v1
 
 # postGISVersion if set and coupled with a PostGIS enabled container, enables
 # PostGIS. This version number needs to be available as one of the

kustomize/azure/postgres.yaml

@@ -1,9 +1,9 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/v1
 kind: PostgresCluster
 metadata:
 name: hippo-azure
 spec:
-postgresVersion: 17
+postgresVersion: 18
 instances:
  - dataVolumeClaimSpec:
 accessModes:

kustomize/certmanager/postgres/postgres.yaml

@@ -1,9 +1,9 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/v1
 kind: PostgresCluster
 metadata:
 name: hippo
 spec:
-postgresVersion: 17
+postgresVersion: 18
 customReplicationTLSSecret:
 name: hippo-repl-tls
 customTLSSecret:

kustomize/gcs/postgres.yaml

@@ -1,9 +1,9 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/v1
 kind: PostgresCluster
 metadata:
 name: hippo-gcs
 spec:
-postgresVersion: 17
+postgresVersion: 18
 instances:
  - dataVolumeClaimSpec:
 accessModes:

kustomize/high-availability/ha-postgres.yaml

@@ -1,9 +1,9 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/v1
 kind: PostgresCluster
 metadata:
 name: hippo-ha
 spec:
-postgresVersion: 17
+postgresVersion: 18
 instances:
  - name: pgha1
 replicas: 2

kustomize/keycloak/postgres.yaml

@@ -1,11 +1,11 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/v1
 kind: PostgresCluster
 metadata:
 name: keycloakdb
 annotations:
 postgres-operator.crunchydata.com/autoCreateUserSchema: "true"
 spec:
-postgresVersion: 17
+postgresVersion: 18
 instances:
  - replicas: 2
 dataVolumeClaimSpec:

kustomize/multi-backup-repo/postgres.yaml

@@ -1,9 +1,9 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
+apiVersion: postgres-operator.crunchydata.com/v1
 kind: PostgresCluster
 metadata:
 name: hippo-multi-repo
 spec:
-postgresVersion: 17
+postgresVersion: 18
 instances:
  - dataVolumeClaimSpec:
 accessModes: