Skip to content

Commit 83c46e1

Browse files
committed
October updates to workflows and README
Issue: PGO-738 Issue: PGO-1829
1 parent adb0551 commit 83c46e1

File tree

4 files changed

+42
-44
lines changed

4 files changed

+42
-44
lines changed

.github/workflows/test.yaml

+28-27
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
kubernetes: [v1.30, v1.25]
56+
kubernetes: [v1.31, v1.28]
5757
steps:
5858
- uses: actions/checkout@v4
5959
- uses: actions/setup-go@v5
@@ -64,9 +64,9 @@ jobs:
6464
with:
6565
k3s-channel: "${{ matrix.kubernetes }}"
6666
prefetch-images: |
67-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-1
68-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-1
69-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-1
67+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.53.1-0
68+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-0
69+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.4-2
7070
7171
- run: make createnamespaces check-envtest-existing
7272
env:
@@ -88,7 +88,7 @@ jobs:
8888
strategy:
8989
fail-fast: false
9090
matrix:
91-
kubernetes: [v1.29, v1.28, v1.27, v1.26, v1.25]
91+
kubernetes: [v1.31, v1.30, v1.29, v1.28]
9292
steps:
9393
- uses: actions/checkout@v4
9494
- uses: actions/setup-go@v5
@@ -99,16 +99,16 @@ jobs:
9999
with:
100100
k3s-channel: "${{ matrix.kubernetes }}"
101101
prefetch-images: |
102-
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-26
103-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-1
104-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-1
102+
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-31
103+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.53.1-0
104+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-0
105105
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest
106106
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest
107-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-1
108-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-1
109-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-1
110-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-1
111-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-1
107+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.4-2
108+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.3-2
109+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.4-2
110+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.0-0
111+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.0-3.4-0
112112
- run: go mod download
113113
- name: Build executable
114114
run: PGO_VERSION='${{ github.sha }}' make build-postgres-operator
@@ -117,7 +117,7 @@ jobs:
117117
run: make get-pgmonitor
118118
env:
119119
PGMONITOR_DIR: "${{ github.workspace }}/hack/tools/pgmonitor"
120-
QUERIES_CONFIG_DIR: "${{ github.workspace }}/hack/tools/queries"
120+
QUERIES_CONFIG_DIR: "${{ github.workspace }}/hack/tools/queries"
121121

122122
# Start a Docker container with the working directory mounted.
123123
- name: Start PGO
@@ -127,19 +127,20 @@ jobs:
127127
hack/create-kubeconfig.sh postgres-operator pgo
128128
docker run --detach --network host --read-only \
129129
--volume "$(pwd):/mnt" --workdir '/mnt' --env 'PATH=/mnt/bin' \
130+
--env 'CHECK_FOR_UPGRADES=false' \
130131
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
131132
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
132-
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-26' \
133-
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-1' \
134-
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-1' \
133+
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-31' \
134+
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.53.1-0' \
135+
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-0' \
135136
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest' \
136137
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest' \
137-
--env 'RELATED_IMAGE_POSTGRES_15=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-1' \
138-
--env 'RELATED_IMAGE_POSTGRES_15_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-1' \
139-
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-1' \
140-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-1' \
141-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-1' \
142-
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.6-1' \
138+
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.4-2' \
139+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.3-2' \
140+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.4-2' \
141+
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.0-0' \
142+
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.0-3.4-0' \
143+
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.12-0' \
143144
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true' \
144145
--name 'postgres-operator' ubuntu \
145146
postgres-operator
@@ -150,11 +151,11 @@ jobs:
150151
151152
- run: make generate-kuttl
152153
env:
153-
KUTTL_PG_UPGRADE_FROM_VERSION: '15'
154-
KUTTL_PG_UPGRADE_TO_VERSION: '16'
155-
KUTTL_PG_VERSION: '15'
154+
KUTTL_PG_UPGRADE_FROM_VERSION: '16'
155+
KUTTL_PG_UPGRADE_TO_VERSION: '17'
156+
KUTTL_PG_VERSION: '16'
156157
KUTTL_POSTGIS_VERSION: '3.4'
157-
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-1'
158+
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.4-2'
158159
- run: |
159160
make check-kuttl && exit
160161
failed=$?

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ For more information about which versions of the PostgreSQL Operator include whi
189189

190190
PGO, the Postgres Operator from Crunchy Data, is tested on the following platforms:
191191

192-
- Kubernetes 1.25-1.30
193-
- OpenShift 4.12-4.16
192+
- Kubernetes v1.28 - v1.31
193+
- OpenShift v4.12 - v4.16
194194
- Rancher
195195
- Google Kubernetes Engine (GKE), including Anthos
196196
- Amazon EKS

config/manager/manager.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@ spec:
2222
fieldPath: metadata.namespace
2323
- name: CRUNCHY_DEBUG
2424
value: "true"
25-
- name: RELATED_IMAGE_POSTGRES_15
26-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-1"
27-
- name: RELATED_IMAGE_POSTGRES_15_GIS_3.3
28-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-1"
2925
- name: RELATED_IMAGE_POSTGRES_16
30-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-1"
26+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.4-2"
3127
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.3
32-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-1"
28+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.3-2"
3329
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.4
34-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-1"
30+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.4-2"
31+
- name: RELATED_IMAGE_POSTGRES_17
32+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.0-0"
33+
- name: RELATED_IMAGE_POSTGRES_17_GIS_3.4
34+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.0-3.4-0"
3535
- name: RELATED_IMAGE_PGADMIN
36-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-26"
36+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-31"
3737
- name: RELATED_IMAGE_PGBACKREST
38-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-1"
38+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.53.1-0"
3939
- name: RELATED_IMAGE_PGBOUNCER
40-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-1"
40+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-0"
4141
- name: RELATED_IMAGE_PGEXPORTER
4242
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest"
4343
- name: RELATED_IMAGE_PGUPGRADE
4444
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest"
4545
- name: RELATED_IMAGE_STANDALONE_PGADMIN
46-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.6-1"
46+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.12-0"
4747
securityContext:
4848
allowPrivilegeEscalation: false
4949
capabilities: { drop: [ALL] }

examples/postgrescluster/postgrescluster.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ kind: PostgresCluster
33
metadata:
44
name: hippo
55
spec:
6-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-1
76
postgresVersion: 16
87
instances:
98
- name: instance1
@@ -15,7 +14,6 @@ spec:
1514
storage: 1Gi
1615
backups:
1716
pgbackrest:
18-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-1
1917
repos:
2018
- name: repo1
2119
volume:
@@ -34,5 +32,4 @@ spec:
3432
requests:
3533
storage: 1Gi
3634
proxy:
37-
pgBouncer:
38-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-1
35+
pgBouncer: {}

0 commit comments

Comments
 (0)