diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 51f034f52a..2c9c043abe 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -64,9 +64,9 @@ jobs: with: k3s-channel: "${{ matrix.kubernetes }}" prefetch-images: | - docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 - docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1 - docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 + docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1 + docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 - run: make createnamespaces check-envtest-existing env: @@ -98,12 +98,12 @@ jobs: with: k3s-channel: "${{ matrix.kubernetes }}" prefetch-images: | - docker.io/ivorysql/pgadmin:ubi9-9.9-5.1-1 - docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 - docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1 - docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.1-1 - docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 - docker.io/ivorysql/postgis:ubi9-3.5-5.1-1 + docker.io/ivorysql/pgadmin:ubi9-9.9-5.3-1 + docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 + docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1 + docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.3-1 + docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 + docker.io/ivorysql/postgis:ubi9-3.5-5.3-1 registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-5.3.1-0 - run: go mod download - name: Build executable @@ -118,13 +118,13 @@ jobs: docker run --detach --network host --read-only \ --volume "$(pwd):/mnt" --workdir '/mnt' --env 'PATH=/mnt/bin' \ --env 'KUBECONFIG=hack/.kube/ivory-operator/ivyo' \ - --env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi9-9.9-5.1-1' \ - --env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1' \ - --env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1' \ - --env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.1-1' \ + --env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi9-9.9-5.3-1' \ + --env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1' \ + --env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1' \ + --env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.3-1' \ --env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-5.3.1-0' \ - --env 'RELATED_IMAGE_IVORY_18=docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1' \ - --env 'RELATED_IMAGE_IVORY_18_GIS_3.5=docker.io/ivorysql/postgis:ubi9-3.5-5.1-1' \ + --env 'RELATED_IMAGE_IVORY_18=docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1' \ + --env 'RELATED_IMAGE_IVORY_18_GIS_3.5=docker.io/ivorysql/postgis:ubi9-3.5-5.3-1' \ --env 'IVYO_FEATURE_GATES=TablespaceVolumes=true' \ --name 'ivory-operator' ubuntu \ ivory-operator @@ -139,7 +139,7 @@ jobs: KUTTL_PG_UPGRADE_TO_VERSION: '18' KUTTL_PG_VERSION: '18' KUTTL_POSTGIS_VERSION: '3.5' - KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1' + KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1' - run: | make check-kuttl && exit failed=$? diff --git a/Makefile b/Makefile index 8b0f4db0db..7000359585 100644 --- a/Makefile +++ b/Makefile @@ -205,8 +205,8 @@ check-kuttl: ## example command: make check-kuttl KUTTL_TEST=' 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_IVORY_IMAGE ?= docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 +generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.5 +generate-kuttl: export KUTTL_IVORY_IMAGE ?= docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 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/config/manager/manager.yaml b/config/manager/manager.yaml index d03c5e4a23..dd2ed68742 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -19,19 +19,19 @@ spec: - name: IVORY_DEBUG value: "true" - name: RELATED_IMAGE_IVORY_18 - value: "docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1" + value: "docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1" - name: RELATED_IMAGE_PGADMIN - value: "docker.io/ivorysql/pgadmin:ubi9-9.9-5.1-1" + value: "docker.io/ivorysql/pgadmin:ubi9-9.9-5.3-1" - name: RELATED_IMAGE_PGBACKREST - value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1" + value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1" - name: RELATED_IMAGE_PGBOUNCER - value: "docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1" + value: "docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1" - name: RELATED_IMAGE_PGEXPORTER - value: "docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.1-1" + value: "docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.3-1" - name: RELATED_IMAGE_PGUPGRADE value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-5.3.1-0" - name: RELATED_IMAGE_POSTGRES_18_GIS_3.5 - value: "docker.io/ivorysql/ivorysql-postgis:ubi9-3.5-5.1-1" + value: "docker.io/ivorysql/ivorysql-postgis:ubi9-3.5-5.3-1" securityContext: allowPrivilegeEscalation: false capabilities: { drop: [ALL] } diff --git a/examples/ivorycluster/ivorycluster.yaml b/examples/ivorycluster/ivorycluster.yaml index af63bac349..addff8c583 100644 --- a/examples/ivorycluster/ivorycluster.yaml +++ b/examples/ivorycluster/ivorycluster.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - name: instance1 @@ -15,7 +15,7 @@ spec: storage: 1Gi backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 repos: - name: repo1 volume: diff --git a/examples/kustomize/azure/ivory.yaml b/examples/kustomize/azure/ivory.yaml index 6ac5f31090..eccebd92a9 100644 --- a/examples/kustomize/azure/ivory.yaml +++ b/examples/kustomize/azure/ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo-azure spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - dataVolumeClaimSpec: @@ -14,7 +14,7 @@ spec: storage: 1Gi backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 configuration: - secret: name: ivyo-azure-creds diff --git a/examples/kustomize/gcs/ivory.yaml b/examples/kustomize/gcs/ivory.yaml index 030a601355..f1025a55c4 100644 --- a/examples/kustomize/gcs/ivory.yaml +++ b/examples/kustomize/gcs/ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo-gcs spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - dataVolumeClaimSpec: @@ -14,7 +14,7 @@ spec: storage: 1Gi backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 configuration: - secret: name: ivyo-gcs-creds diff --git a/examples/kustomize/high-availability/ha-ivory.yaml b/examples/kustomize/high-availability/ha-ivory.yaml index 2f7ea53ea8..456f6c6a11 100644 --- a/examples/kustomize/high-availability/ha-ivory.yaml +++ b/examples/kustomize/high-availability/ha-ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo-ha spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - name: pgha1 @@ -26,7 +26,7 @@ spec: ivory-operator.ivorysql.org/instance-set: pgha1 backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 repos: - name: repo1 volume: diff --git a/examples/kustomize/install/manager/manager.yaml b/examples/kustomize/install/manager/manager.yaml index 6e3afde6ba..7bf897c893 100644 --- a/examples/kustomize/install/manager/manager.yaml +++ b/examples/kustomize/install/manager/manager.yaml @@ -27,9 +27,9 @@ spec: - name: IVORY_DEBUG value: "true" - name: RELATED_IMAGE_IVORY_5 - value: "docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1" + value: "docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1" - name: RELATED_IMAGE_PGBACKREST - value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1" + value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1" securityContext: allowPrivilegeEscalation: false diff --git a/examples/kustomize/ivory/ivory.yaml b/examples/kustomize/ivory/ivory.yaml index c826c93a11..73b864bb94 100644 --- a/examples/kustomize/ivory/ivory.yaml +++ b/examples/kustomize/ivory/ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - name: instance1 @@ -15,7 +15,7 @@ spec: storage: 1Gi backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 repos: - name: repo1 volume: diff --git a/examples/kustomize/keycloak/ivory.yaml b/examples/kustomize/keycloak/ivory.yaml index 02bd1cdea6..bea0dca058 100644 --- a/examples/kustomize/keycloak/ivory.yaml +++ b/examples/kustomize/keycloak/ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: keycloakdb spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - replicas: 2 @@ -25,7 +25,7 @@ spec: ivory-operator.ivorysql.org/instance-set: "00" backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 repos: - name: repo1 volume: diff --git a/examples/kustomize/multi-backup-repo/ivory.yaml b/examples/kustomize/multi-backup-repo/ivory.yaml index 62a1567825..e5d62916ce 100644 --- a/examples/kustomize/multi-backup-repo/ivory.yaml +++ b/examples/kustomize/multi-backup-repo/ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo-multi-repo spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - dataVolumeClaimSpec: @@ -14,7 +14,7 @@ spec: storage: 1Gi backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 configuration: - secret: name: ivyo-multi-repo-creds diff --git a/examples/kustomize/s3/ivory.yaml b/examples/kustomize/s3/ivory.yaml index 6d2dab9697..a4d9eab848 100644 --- a/examples/kustomize/s3/ivory.yaml +++ b/examples/kustomize/s3/ivory.yaml @@ -3,7 +3,7 @@ kind: IvoryCluster metadata: name: hippo-s3 spec: - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 postgresVersion: 15 instances: - dataVolumeClaimSpec: @@ -14,7 +14,7 @@ spec: storage: 1Gi backups: pgbackrest: - image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1 + image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1 configuration: - secret: name: ivyo-s3-creds diff --git a/testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml b/testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml index fdc1512fdd..d6f5d28c58 100644 --- a/testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml +++ b/testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml @@ -4,7 +4,7 @@ metadata: name: exporter spec: postgresVersion: 18 - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1 instances: - name: instance1 dataVolumeClaimSpec: diff --git a/testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml b/testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml index b03a11486f..09b04c8f5a 100644 --- a/testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml +++ b/testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml @@ -4,4 +4,4 @@ metadata: name: exporter spec: postgresVersion: 18 - image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1 + image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1