Skip to content

Commit d7d2a1d

Browse files
benjaminjbbenjaminjb
authored
Update images (#4161)
* Update images * Update x/net
1 parent 042acc1 commit d7d2a1d

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎.github/workflows/test.yaml

+24-24
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
with:
6868
k3s-channel: "${{ matrix.kubernetes }}"
6969
prefetch-images: |
70-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513
71-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513
72-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513
70+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2516
71+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2516
72+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2516
7373
7474
- run: make createnamespaces check-envtest-existing
7575
env:
@@ -101,15 +101,15 @@ jobs:
101101
with:
102102
k3s-channel: "${{ matrix.kubernetes }}"
103103
prefetch-images: |
104-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513
105-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513
106-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.16.0-2513
107-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2513
108-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513
109-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2513
110-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2513
111-
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513
112-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.4-2513
104+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2516
105+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2516
106+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.17.1-2516
107+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2516
108+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2516
109+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2516
110+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2516
111+
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2516
112+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.4-2516
113113
- run: go mod download
114114
- name: Build executable
115115
run: PGO_VERSION='${{ github.sha }}' make build-postgres-operator
@@ -131,17 +131,17 @@ jobs:
131131
--env 'CHECK_FOR_UPGRADES=false' \
132132
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
133133
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
134-
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513' \
135-
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513' \
136-
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.16.0-2513' \
137-
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513' \
138-
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513' \
139-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2513' \
140-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2513' \
141-
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2513' \
142-
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.4-2513' \
143-
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.1-2513' \
144-
--env 'RELATED_IMAGE_COLLECTOR=registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.0-0' \
134+
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2516' \
135+
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2516' \
136+
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.17.1-2516' \
137+
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2516' \
138+
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2516' \
139+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2516' \
140+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2516' \
141+
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2516' \
142+
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.4-2516' \
143+
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.2-2516' \
144+
--env 'RELATED_IMAGE_COLLECTOR=registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.1-0' \
145145
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true,OpenTelemetryLogs=true,OpenTelemetryMetrics=true' \
146146
--name 'postgres-operator' ubuntu \
147147
postgres-operator
@@ -156,7 +156,7 @@ jobs:
156156
KUTTL_PG_UPGRADE_TO_VERSION: '17'
157157
KUTTL_PG_VERSION: '16'
158158
KUTTL_POSTGIS_VERSION: '3.4'
159-
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513'
159+
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2516'
160160
- run: |
161161
make check-kuttl && exit
162162
failed=$?

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 16
229229
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 17
230230
generate-kuttl: export KUTTL_PG_VERSION ?= 16
231231
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.4
232-
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2513
232+
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2516
233233
generate-kuttl: export KUTTL_TEST_DELETE_NAMESPACE ?= kuttl-test-delete-namespace
234234
generate-kuttl: ## Generate kuttl tests
235235
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated

‎config/manager/manager.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ spec:
2323
- name: CRUNCHY_DEBUG
2424
value: "true"
2525
- name: RELATED_IMAGE_POSTGRES_16
26-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513"
26+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2516"
2727
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.3
28-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2513"
28+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2516"
2929
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.4
30-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2513"
30+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2516"
3131
- name: RELATED_IMAGE_POSTGRES_17
32-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2513"
32+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2516"
3333
- name: RELATED_IMAGE_POSTGRES_17_GIS_3.4
34-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.5-2513"
34+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.5-2516"
3535
- name: RELATED_IMAGE_PGBACKREST
36-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513"
36+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2516"
3737
- name: RELATED_IMAGE_PGBOUNCER
38-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513"
38+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2516"
3939
- name: RELATED_IMAGE_PGEXPORTER
40-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.16.0-2513"
40+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.17.1-2516"
4141
- name: RELATED_IMAGE_PGUPGRADE
42-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513"
42+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2516"
4343
- name: RELATED_IMAGE_STANDALONE_PGADMIN
44-
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.1-2513"
44+
value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.2-2516"
4545
- name: RELATED_IMAGE_COLLECTOR
46-
value: "registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.0-0"
46+
value: "registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.1-0"
4747
securityContext:
4848
allowPrivilegeEscalation: false
4949
capabilities: { drop: [ALL] }

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ require (
104104
go.uber.org/multierr v1.11.0 // indirect
105105
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
106106
golang.org/x/mod v0.22.0 // indirect
107-
golang.org/x/net v0.37.0 // indirect
107+
golang.org/x/net v0.38.0 // indirect
108108
golang.org/x/oauth2 v0.27.0 // indirect
109109
golang.org/x/sync v0.12.0 // indirect
110110
golang.org/x/sys v0.31.0 // indirect

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
222222
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
223223
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
224224
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
225-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
226-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
225+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
226+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
227227
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
228228
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
229229
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)