Update OLM bundle generation logic for postgres major upgrade

This updates the OLM bundle generation logic to allow for the inclusion of the 'postgres-operator-upgrade' controller, the 'crunchy-upgrade' image and related PGUpgrade CRD and functionality. Related examples and documentation have been updated and all current images are included as required. Issue: [sc-17486]

Author: tjmoore4

config/default/kustomization.yaml

@@ -1,6 +1,7 @@
 namespace: postgres-operator
 
 commonLabels:
+ # Note: this label differs from the label set in postgres-operator-examples
  postgres-operator.crunchydata.com/control-plane: postgres-operator
 
 bases:

config/singlenamespace/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: postgres-operator
  newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
- newTag: ubi8-5.3.0-0
+ newTag: ubi8-5.4.0-0

installers/olm/Makefile

@@ -2,8 +2,8 @@
 .SUFFIXES:
 
 CONTAINER ?= docker
-PGO_VERSION ?= 5.2.0
-REPLACES_VERSION ?= 5.1.3
+PGO_VERSION ?= 5.4.0
+REPLACES_VERSION ?= 5.3.0
 
 OS_KERNEL ?= $(shell bash -c 'echo $${1,,}' - `uname -s`)
 OS_MACHINE ?= $(shell bash -c 'echo $${1/x86_/amd}' - `uname -m`)
@@ -45,7 +45,7 @@ bundles/marketplace:
 .PHONY: clean
 clean: clean-deprecated
 clean: ## Remove generated files and downloaded tools
-rm -rf ./bundles ./projects ./tools
+rm -rf ./bundles ./projects ./tools ./config/marketplace
 
 .PHONY: clean-deprecated
 clean-deprecated:

installers/olm/bundle.relatedImages.yaml

@@ -7,6 +7,8 @@
  image: registry.connect.redhat.com/crunchydata/crunchy-pgbouncer@sha256:<update_pgbouncer_SHA_value>
  - name: PGEXPORTER
  image: registry.connect.redhat.com/crunchydata/crunchy-postgres-exporter@sha256:<update_exporter_SHA_value>
+ - name: PGUPGRADE
+ image: registry.connect.redhat.com/crunchydata/crunchy-upgrade@sha256:<update_upgrade_SHA_value>
  - name: POSTGRES_13
  image: registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:<update_postgres13_SHA_value>
  - name: POSTGRES_14

installers/olm/config/examples/kustomization.yaml

@@ -15,3 +15,4 @@ kind: Kustomization
 
 resources:
 - postgrescluster.example.yaml
+- pgupgrade.example.yaml

installers/olm/config/examples/pgupgrade.example.yaml

@@ -0,0 +1,8 @@
+apiVersion: postgres-operator.crunchydata.com/v1beta1
+kind: PGUpgrade
+metadata:
+ name: example-upgrade
+spec:
+ postgresClusterName: example
+ fromPostgresVersion: 13
+ toPostgresVersion: 14

installers/olm/config/examples/postgrescluster.example.yaml

@@ -11,3 +11,13 @@ spec:
  resources:
  requests:
  storage: 1Gi
+ backups:
+ pgbackrest:
+ repos:
+ - name: repo1
+ volume:
+ volumeClaimSpec:
+ accessModes: ["ReadWriteOnce"]
+ resources:
+ requests:
+ storage: 1Gi

installers/olm/config/redhat/related-images.yaml

@@ -18,11 +18,15 @@ spec:
  - { name: RELATED_IMAGE_PGBACKREST, value: 'registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:<update_pgbackrest_SHA_value>' }
  - { name: RELATED_IMAGE_PGBOUNCER, value: 'registry.connect.redhat.com/crunchydata/crunchy-pgbouncer@sha256:<update_pgbouncer_SHA_value>' }
  - { name: RELATED_IMAGE_PGEXPORTER, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-exporter@sha256:<update_exporter_SHA_value>' }
+ - { name: RELATED_IMAGE_PGUPGRADE, value: 'registry.connect.redhat.com/crunchydata/crunchy-upgrade@sha256:<update_upgrade_SHA_value>' }
 
  - { name: RELATED_IMAGE_POSTGRES_13, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:<update_postgres13_SHA_value>' }
  - { name: RELATED_IMAGE_POSTGRES_14, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:<update_postgres14_SHA_value>' }
+ - { name: RELATED_IMAGE_POSTGRES_15, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:<update_postgres15_SHA_value>' }
 
  - { name: RELATED_IMAGE_POSTGRES_13_GIS_3.0, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:<update_postgres13gis30_SHA_value>' }
  - { name: RELATED_IMAGE_POSTGRES_13_GIS_3.1, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:<update_postgres13gis31_SHA_value>' }
  - { name: RELATED_IMAGE_POSTGRES_14_GIS_3.1, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:<update_postgres14gis31_SHA_value>' }
  - { name: RELATED_IMAGE_POSTGRES_14_GIS_3.2, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:<update_postgres14gis32_SHA_value>' }
+ - { name: RELATED_IMAGE_POSTGRES_14_GIS_3.3, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:<update_postgres14gis33_SHA_value>' }
+ - { name: RELATED_IMAGE_POSTGRES_15_GIS_3.3, value: 'registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:<update_postgres15gis33_SHA_value>' }

installers/olm/description.md

@@ -31,6 +31,7 @@ Kubernetes, providing a seamless cloud native Postgres solution to keep your dat
 - **Connection Pooling**: Advanced [connection pooling][pool] support using [pgBouncer][].
 - **Affinity and Tolerations**: Have your PostgreSQL clusters deployed to [Kubernetes Nodes][k8s-nodes] of your preference.
  Set your [pod anti-affinity][k8s-anti-affinity], node affinity, Pod tolerations and more rules to customize your deployment topology!
+- **PostgreSQL Major Version Upgrades**: Perform a [PostgreSQL major version upgrade][major-version-upgrade] declaratively.
 - **Full Customizability**: Crunchy PostgreSQL for Kubernetes makes it easy to get your own PostgreSQL-as-a-Service up and running
  and fully customize your deployments, including:
  - Choose the resources for your Postgres cluster: [container resources and storage size][resize-cluster]. [Resize at any time][resize-cluster] with minimal disruption.
@@ -44,6 +45,7 @@ and much more!
 [customize-cluster]: https://access.crunchydata.com/documentation/postgres-operator/v5/tutorial/customize-cluster/
 [disaster-recovery]: https://access.crunchydata.com/documentation/postgres-operator/v5/tutorial/disaster-recovery/
 [high-availability]: https://access.crunchydata.com/documentation/postgres-operator/v5/tutorial/high-availability/
+[major-version-upgrade]: https://access.crunchydata.com/documentation/postgres-operator/v5/guides/major-postgres-version-upgrade/
 [monitoring]: https://access.crunchydata.com/documentation/postgres-operator/v5/tutorial/monitoring/
 [pool]: https://access.crunchydata.com/documentation/postgres-operator/v5/tutorial/connection-pooling/
 [provisioning]: https://access.crunchydata.com/documentation/postgres-operator/v5/tutorial/create-cluster/