Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes: [v1.30, v1.33]
kubernetes: [v1.32, v1.34]
steps:
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
Expand All @@ -64,9 +64,9 @@ jobs:
with:
k3s-channel: "${{ matrix.kubernetes }}"
prefetch-images: |
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2547
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2547
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2547
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2550
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.25-2550
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2550

- run: make createnamespaces check-envtest-existing
env:
Expand All @@ -87,7 +87,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes: [v1.30, v1.33]
kubernetes: [v1.32, v1.34]
steps:
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
Expand All @@ -98,8 +98,8 @@ jobs:
with:
k3s-channel: "${{ matrix.kubernetes }}"
prefetch-images: |
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2547
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2547
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2550
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550

- name: Get pgMonitor files.
run: make get-pgmonitor
Expand All @@ -118,8 +118,8 @@ jobs:
--volume "$(pwd):/mnt" --workdir '/mnt' \
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2547' \
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2547' \
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2550' \
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550' \
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true,OpenTelemetryLogs=true,OpenTelemetryMetrics=true' \
--name 'postgres-operator' localhost/postgres-operator

Expand All @@ -138,7 +138,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes: [v1.30, v1.33]
kubernetes: [v1.32, v1.34]
steps:
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
Expand All @@ -150,13 +150,14 @@ jobs:
k3s-channel: "${{ matrix.kubernetes }}"
prefetch-timeout: 5m
prefetch-images: |
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2547
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2547
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2547
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2547
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.18.1-2547
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-18.1-2547
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.8-2547
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2550
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2550
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.25-2550
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.18.1-2550
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-18.1-2550
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.8-2550
registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-6.0.0-0

- name: Get pgMonitor files.
run: make get-pgmonitor
Expand All @@ -175,14 +176,14 @@ jobs:
--volume "$(pwd):/mnt" --workdir '/mnt' \
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2547' \
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2547' \
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.18.1-2547' \
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-18.1-2547' \
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2547' \
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2547' \
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.8-2547' \
--env 'RELATED_IMAGE_COLLECTOR=registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.5-0' \
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2550' \
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.25-2550' \
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.18.1-2550' \
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-18.1-2550' \
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2550' \
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550' \
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.8-2550' \
--env 'RELATED_IMAGE_COLLECTOR=registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-6.0.0-0' \
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true,OpenTelemetryLogs=true,OpenTelemetryMetrics=true' \
--name 'postgres-operator' localhost/postgres-operator

Expand All @@ -192,7 +193,7 @@ jobs:
KUTTL_PG_UPGRADE_TO_VERSION: '17'
KUTTL_PG_VERSION: '16'
KUTTL_POSTGIS_VERSION: '3.4'
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2547'
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550'
- run: |
make check-kuttl && exit
failed=$?
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 16
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 17
generate-kuttl: export KUTTL_PG_VERSION ?= 16
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.4
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2547
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550
generate-kuttl: export KUTTL_TEST_DELETE_NAMESPACE ?= kuttl-test-delete-namespace
generate-kuttl: ## Generate kuttl tests
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ spec:
path: /healthz
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
periodSeconds: 10
2 changes: 1 addition & 1 deletion testing/chainsaw/e2e/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ versions:
postgrescluster: 'v1'

images:
psql: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2547'
psql: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550'
Loading