Skip to content

Commit cec3cc0

Browse files
dsessler7dsessler7
committed
Update master branch after may 2024 minor release.
1 parent 549c4dd commit cec3cc0

File tree

5 files changed

+38
-52
lines changed

5 files changed

+38
-52
lines changed

‎.github/workflows/test.yaml

+22-27
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
kubernetes: [v1.29, v1.25]
57+
kubernetes: [v1.30, v1.25]
5858
steps:
5959
- uses: actions/checkout@v4
6060
- uses: actions/setup-go@v5
@@ -65,9 +65,9 @@ jobs:
6565
with:
6666
k3s-channel: "${{ matrix.kubernetes }}"
6767
prefetch-images: |
68-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.49-0
69-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.21-3
70-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.11-0
68+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-0
69+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-0
70+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-0
7171
7272
- run: make createnamespaces check-envtest-existing
7373
env:
@@ -100,19 +100,16 @@ jobs:
100100
with:
101101
k3s-channel: "${{ matrix.kubernetes }}"
102102
prefetch-images: |
103-
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-22
104-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.49-0
105-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.21-3
103+
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-25
104+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-0
105+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-0
106106
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest
107107
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest
108-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.11-0
109-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.11-3.1-0
110-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.6-0
111-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.6-3.3-0
112-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.2-0
113-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.2-3.3-0
114-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.2-3.4-0
115-
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-7.8-3
108+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-0
109+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-0
110+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-0
111+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-0
112+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-0
116113
- run: go mod download
117114
- name: Build executable
118115
run: PGO_VERSION='${{ github.sha }}' make build-postgres-operator
@@ -133,19 +130,17 @@ jobs:
133130
--volume "$(pwd):/mnt" --workdir '/mnt' --env 'PATH=/mnt/bin' \
134131
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
135132
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
136-
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-22' \
137-
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.49-0' \
138-
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.21-3' \
133+
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-25' \
134+
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-0' \
135+
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-0' \
139136
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest' \
140137
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest' \
141-
--env 'RELATED_IMAGE_POSTGRES_14=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.11-0' \
142-
--env 'RELATED_IMAGE_POSTGRES_14_GIS_3.1=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.11-3.1-0' \
143-
--env 'RELATED_IMAGE_POSTGRES_15=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.6-0' \
144-
--env 'RELATED_IMAGE_POSTGRES_15_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.6-3.3-0' \
145-
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.2-0' \
146-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.2-3.3-0' \
147-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.2-3.4-0' \
148-
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-7.8-3' \
138+
--env 'RELATED_IMAGE_POSTGRES_15=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-0' \
139+
--env 'RELATED_IMAGE_POSTGRES_15_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-0' \
140+
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-0' \
141+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-0' \
142+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-0' \
143+
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.6-0' \
149144
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true' \
150145
--name 'postgres-operator' ubuntu \
151146
postgres-operator
@@ -160,7 +155,7 @@ jobs:
160155
KUTTL_PG_UPGRADE_TO_VERSION: '16'
161156
KUTTL_PG_VERSION: '15'
162157
KUTTL_POSTGIS_VERSION: '3.4'
163-
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.2-0'
158+
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-0'
164159
- run: |
165160
make check-kuttl && exit
166161
failed=$?

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 15
226226
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 16
227227
generate-kuttl: export KUTTL_PG_VERSION ?= 16
228228
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.4
229-
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.2-0
229+
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-0
230230
generate-kuttl: export KUTTL_TEST_DELETE_NAMESPACE ?= kuttl-test-delete-namespace
231231
generate-kuttl: ## Generate kuttl tests
232232
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
@@ -238,7 +238,6 @@ generate-kuttl: ## Generate kuttl tests
238238
14 ) export KUTTL_BITNAMI_IMAGE_TAG=14.5.0-debian-11-r37 ;; \
239239
13 ) export KUTTL_BITNAMI_IMAGE_TAG=13.8.0-debian-11-r39 ;; \
240240
12 ) export KUTTL_BITNAMI_IMAGE_TAG=12.12.0-debian-11-r40 ;; \
241-
11 ) export KUTTL_BITNAMI_IMAGE_TAG=11.17.0-debian-11-r39 ;; \
242241
esac; \
243242
render() { envsubst '"'"' \
244243
$$KUTTL_PG_UPGRADE_FROM_VERSION $$KUTTL_PG_UPGRADE_TO_VERSION \

‎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.28
193-
- OpenShift 4.10-4.13
192+
- Kubernetes 1.25-1.30
193+
- OpenShift 4.10-4.15
194194
- Rancher
195195
- Google Kubernetes Engine (GKE), including Anthos
196196
- Amazon EKS

‎config/manager/manager.yaml

+9-17
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,28 @@ spec:
1818
fieldPath: metadata.namespace
1919
- name: CRUNCHY_DEBUG
2020
value: "true"
21-
- name: RELATED_IMAGE_POSTGRES_14
22-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.11-0"
23-
- name: RELATED_IMAGE_POSTGRES_14_GIS_3.1
24-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.11-3.1-0"
25-
- name: RELATED_IMAGE_POSTGRES_14_GIS_3.2
26-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.11-3.2-0"
27-
- name: RELATED_IMAGE_POSTGRES_14_GIS_3.3
28-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.11-3.3-0"
2921
- name: RELATED_IMAGE_POSTGRES_15
30-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.6-0"
22+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-0"
3123
- name: RELATED_IMAGE_POSTGRES_15_GIS_3.3
32-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.6-3.3-0"
24+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-0"
3325
- name: RELATED_IMAGE_POSTGRES_16
34-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.2-0"
26+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-0"
3527
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.3
36-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.2-3.3-0"
28+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-0"
3729
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.4
38-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.2-3.4-0"
30+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-0"
3931
- name: RELATED_IMAGE_PGADMIN
40-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-22"
32+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-25"
4133
- name: RELATED_IMAGE_PGBACKREST
42-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.49-0"
34+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-0"
4335
- name: RELATED_IMAGE_PGBOUNCER
44-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.21-3"
36+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-0"
4537
- name: RELATED_IMAGE_PGEXPORTER
4638
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest"
4739
- name: RELATED_IMAGE_PGUPGRADE
4840
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest"
4941
- name: RELATED_IMAGE_STANDALONE_PGADMIN
50-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-7.8-3"
42+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.6-0"
5143
securityContext:
5244
allowPrivilegeEscalation: false
5345
capabilities: { drop: [ALL] }

‎examples/postgrescluster/postgrescluster.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ kind: PostgresCluster
33
metadata:
44
name: hippo
55
spec:
6-
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.3-2
7-
postgresVersion: 15
6+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-0
7+
postgresVersion: 16
88
instances:
99
- name: instance1
1010
dataVolumeClaimSpec:
@@ -15,7 +15,7 @@ spec:
1515
storage: 1Gi
1616
backups:
1717
pgbackrest:
18-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.45-2
18+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-0
1919
repos:
2020
- name: repo1
2121
volume:
@@ -35,4 +35,4 @@ spec:
3535
storage: 1Gi
3636
proxy:
3737
pgBouncer:
38-
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.19-2
38+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-0

0 commit comments

Comments
 (0)