Updated images to the latest versions and updated to postgres 15

ValClarkson · ValClarkson · commit d16b11c20c46 · 2023-04-11T16:07:17.000-04:00
Issue [sc-17991]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -29,8 +29,8 @@ Please provide the following details:
 
 - Platform: (`Kubernetes`, `OpenShift`, `Rancher`, `GKE`, `EKS`, `AKS` etc.)
 - Platform Version: (e.g. `1.20.3`, `4.7.0`)
-- PGO Image Tag: (e.g. `ubi8-5.3.0-0`)
-- Postgres Version (e.g. `14`)
+- PGO Image Tag: (e.g. `ubi8-5.3.1-0`)
+- Postgres Version (e.g. `15`)
 - Storage: (e.g. `hostpath`, `nfs`, or the name of your storage class)
 
 ## Steps to Reproduce
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -32,8 +32,8 @@ Please provide the following details:
 
 - Platform: (`Kubernetes`, `OpenShift`, `Rancher`, `GKE`, `EKS`, `AKS` etc.)
 - Platform Version: (e.g. `1.20.3`, `4.7.0`)
-- PGO Image Tag: (e.g. `ubi8-5.3.0-0`)
-- Postgres Version (e.g. `14`)
+- PGO Image Tag: (e.g. `ubi8-5.3.1-0`)
+- Postgres Version (e.g. `15`)
 - Storage: (e.g. `hostpath`, `nfs`, or the name of your storage class)
 - Number of Postgres clusters: (`XYZ`)
 
diff --git a/.github/ISSUE_TEMPLATE/support---question-and-answer.md b/.github/ISSUE_TEMPLATE/support---question-and-answer.md
@@ -31,5 +31,5 @@ Please provide the following details:
 - Platform: (`Kubernetes`, `OpenShift`, `Rancher`, `GKE`, `EKS`, `AKS` etc.)
 - Platform Version: (e.g. `1.20.3`, `4.7.0`)
 - PGO Image Tag: (e.g. `ubi8-5.1.0-0`)
-- Postgres Version (e.g. `14`)
+- Postgres Version (e.g. `15`)
 - Storage: (e.g. `hostpath`, `nfs`, or the name of your storage class)
diff --git a/Makefile b/Makefile
@@ -13,8 +13,8 @@ CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION ?= \
 	and has a SQL interface to a database to allow for metrics collection.
 CRUNCHY_POSTGRES_EXPORTER_URL ?= https://www.crunchydata.com/products/crunchy-postgresql-for-kubernetes
 CRUNCHY_POSTGRES_EXPORTER_IMAGE_PREFIX ?= $(PGO_IMAGE_PREFIX)
-CRUNCHY_POSTGRES_EXPORTER_PG_VERSION ?= 14
-CRUNCHY_POSTGRES_EXPORTER_PG_FULL_VERSION ?= 14.6
+CRUNCHY_POSTGRES_EXPORTER_PG_VERSION ?= 15
+CRUNCHY_POSTGRES_EXPORTER_PG_FULL_VERSION ?= 15.2
 
 PGMONITOR_DIR ?= hack/tools/pgmonitor
 PGMONITOR_VERSION ?= 'v4.8.0'
@@ -268,11 +268,11 @@ check-kuttl: ## example command: make check-kuttl KUTTL_TEST='
 		--config testing/kuttl/kuttl-test.yaml
 
 .PHONY: generate-kuttl
-generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 13
-generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 14
-generate-kuttl: export KUTTL_PG_VERSION ?= 14
-generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.1
-generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2
+generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 14
+generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 15
+generate-kuttl: export KUTTL_PG_VERSION ?= 15
+generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.3
+generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
 generate-kuttl: ## Generate kuttl tests
 	[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
 	[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other
diff --git a/build/crd/pgupgrades/kustomization.yaml b/build/crd/pgupgrades/kustomization.yaml
@@ -34,4 +34,4 @@ patches:
       path: "/metadata/labels"
       value:
         app.kubernetes.io/name: pgo
-        app.kubernetes.io/version: 5.3.0
+        app.kubernetes.io/version: 5.3.1
diff --git a/build/crd/postgresclusters/kustomization.yaml b/build/crd/postgresclusters/kustomization.yaml
@@ -39,4 +39,4 @@ patchesJson6902:
       path: "/metadata/labels"
       value:
         app.kubernetes.io/name: pgo
-        app.kubernetes.io/version: 5.3.0
+        app.kubernetes.io/version: 5.3.1
diff --git a/config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml b/config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml
@@ -6,7 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: pgo
-    app.kubernetes.io/version: 5.3.0
+    app.kubernetes.io/version: 5.3.1
   name: pgupgrades.postgres-operator.crunchydata.com
 spec:
   group: postgres-operator.crunchydata.com
diff --git a/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml b/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml
@@ -6,7 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: pgo
-    app.kubernetes.io/version: 5.3.0
+    app.kubernetes.io/version: 5.3.1
   name: postgresclusters.postgres-operator.crunchydata.com
 spec:
   group: postgres-operator.crunchydata.com
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -19,27 +19,27 @@ spec:
         - name: CRUNCHY_DEBUG
           value: "true"
         - name: RELATED_IMAGE_POSTGRES_14
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0"
         - name: RELATED_IMAGE_POSTGRES_14_GIS_3.1
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.6-3.1-2"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.7-3.1-0"
         - name: RELATED_IMAGE_POSTGRES_14_GIS_3.2
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.6-3.2-2"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.7-3.2-0"
         - name: RELATED_IMAGE_POSTGRES_14_GIS_3.3
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.6-3.3-2"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.7-3.3-0"
         - name: RELATED_IMAGE_POSTGRES_15
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.1-0"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0"
         - name: RELATED_IMAGE_POSTGRES_15_GIS_3.3
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.1-3.3-0"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.2-3.3-0"
         - name: RELATED_IMAGE_PGADMIN
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-8"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-10"
         - name: RELATED_IMAGE_PGBACKREST
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-2"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4"
         - name: RELATED_IMAGE_PGBOUNCER
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-5"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.18-0"
         - name: RELATED_IMAGE_PGEXPORTER
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.0-0"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.1-0"
         - name: RELATED_IMAGE_PGUPGRADE
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.0-0"        
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0"        
         securityContext:
           allowPrivilegeEscalation: false
           capabilities: { drop: [ALL] }
diff --git a/docs/config.toml b/docs/config.toml
@@ -26,32 +26,32 @@ disableNavChevron = false # set true to hide next/prev chevron, default is false
 highlightClientSide = false # set true to use highlight.pack.js instead of the default hugo chroma highlighter
 menushortcutsnewtab = true # set true to open shortcuts links to a new tab/window
 enableGitInfo = true
-operatorVersion = "5.3.0"
+operatorVersion = "5.3.1"
 operatorVersionLatestRel5_0 = "5.0.8"
-imageCrunchyPostgres   = "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2"
-imageCrunchyPostgresPrivate       = "registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2"
-imageCrunchyPGBackrest = "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-2"
-imageCrunchyPGBackrestPrivate     = "registry.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-2"
-imageCrunchyPGBouncer  = "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-5"
-imageCrunchyExporter   = "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.0-0"
-imageCrunchyPGAdmin    = "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-4"
-imageCrunchyPGUpgrade  = "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.0-0"
+imageCrunchyPostgres   = "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0"
+imageCrunchyPostgresPrivate       = "registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0"
+imageCrunchyPGBackrest = "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4"
+imageCrunchyPGBackrestPrivate     = "registry.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4"
+imageCrunchyPGBouncer  = "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.18-0"
+imageCrunchyExporter   = "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.1-0"
+imageCrunchyPGAdmin    = "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-10"
+imageCrunchyPGUpgrade  = "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0"
 operatorRepository     = "registry.developers.crunchydata.com/crunchydata/postgres-operator"
 operatorRepositoryPrivate         = "registry.crunchydata.com/crunchydata/postgres-operator"
-postgresOperatorTag = "ubi8-5.3.0-0"
-PGBouncerComponentTagUbi8 = "ubi8-1.17-1"
-PGBouncerTagUbi8 = "ubi8-5.3.0-0"
-postgres14GIS32ComponentTagUbi8 = "ubi8-14.6-3.2-2"
-postgres14GIS32TagUbi8 = "ubi8-14.6-3.2-5.3.0-0"
-postgres14GIS31ComponentTagUbi8 = "ubi8-14.6-3.1-2"
-postgres14GIS31TagUbi8 = "ubi8-14.6-3.1-5.3.0-0"
-fromPostgresVersion = "13"
-postgresVersion = "14"
-postgresVersion15 = "15.1"
-postgresVersion14 = "14.6"
-postgresVersion13 = "13.9"
-postgresVersion12 = "12.13"
-postgresVersion11 = "11.18"
+postgresOperatorTag = "ubi8-5.3.1-0"
+PGBouncerComponentTagUbi8 = "ubi8-1.18-0"
+PGBouncerTagUbi8 = "ubi8-5.3.1-0"
+postgres14GIS32ComponentTagUbi8 = "ubi8-14.7-3.2-0"
+postgres14GIS32TagUbi8 = "ubi8-14.7-3.2-5.3.1-0"
+postgres14GIS31ComponentTagUbi8 = "ubi8-14.7-3.1-0"
+postgres14GIS31TagUbi8 = "ubi8-14.7-3.1-5.3.1-0"
+fromPostgresVersion = "14"
+postgresVersion = "15"
+postgresVersion15 = "15.2"
+postgresVersion14 = "14.7"
+postgresVersion13 = "13.10"
+postgresVersion12 = "12.14"
+postgresVersion11 = "11.19"
 operatorHelmRepository = "oci://registry.developers.crunchydata.com/crunchydata/pgo"
 
 [outputs]
diff --git a/docs/content/guides/huge-pages.md b/docs/content/guides/huge-pages.md
@@ -26,8 +26,8 @@ kind: PostgresCluster
 metadata:
   name: hippo
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2
-  postgresVersion: 14
+  image: {{< param imageCrunchyPostgres >}}
+  postgresVersion: {{< param postgresVersion >}}
   instances:
     - name: instance1
       resources:
diff --git a/examples/postgrescluster/postgrescluster.yaml b/examples/postgrescluster/postgrescluster.yaml
@@ -3,7 +3,7 @@ kind: PostgresCluster
 metadata:
   name: hippo
 spec:
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.5-1
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
   postgresVersion: 14
   instances:
     - name: instance1
@@ -15,7 +15,7 @@ spec:
             storage: 1Gi
   backups:
     pgbackrest:
-      image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.40-1
+      image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4
       repos:
       - name: repo1
         volume:
@@ -35,4 +35,4 @@ spec:
                 storage: 1Gi
   proxy:
     pgBouncer:
-      image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.17-1
+      image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.18-0
diff --git a/installers/olm/config/examples/pgupgrade.example.yaml b/installers/olm/config/examples/pgupgrade.example.yaml
@@ -4,5 +4,5 @@ metadata:
   name: example-upgrade
 spec:
   postgresClusterName: example
-  fromPostgresVersion: 13
-  toPostgresVersion: 14
+  fromPostgresVersion: 14
+  toPostgresVersion: 15
diff --git a/installers/olm/config/examples/postgrescluster.example.yaml b/installers/olm/config/examples/postgrescluster.example.yaml
@@ -3,7 +3,7 @@ kind: PostgresCluster
 metadata:
   name: example
 spec:
-  postgresVersion: 13
+  postgresVersion: 15
   instances:
     - replicas: 1
       dataVolumeClaimSpec:
diff --git a/testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml b/testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml
@@ -3,8 +3,8 @@ kind: PostgresCluster
 metadata:
   name: exporter
 spec:
-  postgresVersion: 14
-  image: us.gcr.io/container-suite/crunchy-postgres:ubi8-14.0-5.0.3-0
+  postgresVersion: 15
+  image: us.gcr.io/container-suite/crunchy-postgres:ubi8-15.2-5.3.1-0
   instances:
     - name: instance1
       dataVolumeClaimSpec:
@@ -27,4 +27,4 @@ spec:
   monitoring:
     pgmonitor:
       exporter:
-        image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.2.0-0
+        image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.1-0
diff --git a/testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml b/testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml
@@ -3,5 +3,5 @@ kind: PostgresCluster
 metadata:
   name: exporter
 spec:
-  postgresVersion: 14
-  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.5-1
+  postgresVersion: 15
+  image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.2-0
diff --git a/testing/kuttl/kuttl-test.yaml b/testing/kuttl/kuttl-test.yaml
@@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 testDirs:
 - testing/kuttl/e2e-generated/
-timeout: 180
+timeout: 300
 parallel: 2
 # by default kuttl will run in a generated namespace to override
 # that functionality simply uncomment the line below and replace
