Skip to content

Commit c474143

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #85 from balinorLiang/v5.3_release
release v5.3
2 parents c7d6fc3 + ab5ae83 commit c474143

14 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
with:
6565
k3s-channel: "${{ matrix.kubernetes }}"
6666
prefetch-images: |
67-
docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
68-
docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1
69-
docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
67+
docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
68+
docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1
69+
docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
7070
7171
- run: make createnamespaces check-envtest-existing
7272
env:
@@ -98,12 +98,12 @@ jobs:
9898
with:
9999
k3s-channel: "${{ matrix.kubernetes }}"
100100
prefetch-images: |
101-
docker.io/ivorysql/pgadmin:ubi9-9.9-5.1-1
102-
docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
103-
docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1
104-
docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.1-1
105-
docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
106-
docker.io/ivorysql/postgis:ubi9-3.5-5.1-1
101+
docker.io/ivorysql/pgadmin:ubi9-9.9-5.3-1
102+
docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
103+
docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1
104+
docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.3-1
105+
docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
106+
docker.io/ivorysql/postgis:ubi9-3.5-5.3-1
107107
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-5.3.1-0
108108
- run: go mod download
109109
- name: Build executable
@@ -118,13 +118,13 @@ jobs:
118118
docker run --detach --network host --read-only \
119119
--volume "$(pwd):/mnt" --workdir '/mnt' --env 'PATH=/mnt/bin' \
120120
--env 'KUBECONFIG=hack/.kube/ivory-operator/ivyo' \
121-
--env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi9-9.9-5.1-1' \
122-
--env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1' \
123-
--env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1' \
124-
--env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.1-1' \
121+
--env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi9-9.9-5.3-1' \
122+
--env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1' \
123+
--env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1' \
124+
--env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.3-1' \
125125
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-5.3.1-0' \
126-
--env 'RELATED_IMAGE_IVORY_18=docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1' \
127-
--env 'RELATED_IMAGE_IVORY_18_GIS_3.5=docker.io/ivorysql/postgis:ubi9-3.5-5.1-1' \
126+
--env 'RELATED_IMAGE_IVORY_18=docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1' \
127+
--env 'RELATED_IMAGE_IVORY_18_GIS_3.5=docker.io/ivorysql/postgis:ubi9-3.5-5.3-1' \
128128
--env 'IVYO_FEATURE_GATES=TablespaceVolumes=true' \
129129
--name 'ivory-operator' ubuntu \
130130
ivory-operator
@@ -139,7 +139,7 @@ jobs:
139139
KUTTL_PG_UPGRADE_TO_VERSION: '18'
140140
KUTTL_PG_VERSION: '18'
141141
KUTTL_POSTGIS_VERSION: '3.5'
142-
KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1'
142+
KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1'
143143
- run: |
144144
make check-kuttl && exit
145145
failed=$?

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ check-kuttl: ## example command: make check-kuttl KUTTL_TEST='
205205
generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 14
206206
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 15
207207
generate-kuttl: export KUTTL_PG_VERSION ?= 15
208-
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.3
209-
generate-kuttl: export KUTTL_IVORY_IMAGE ?= docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
208+
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.5
209+
generate-kuttl: export KUTTL_IVORY_IMAGE ?= docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
210210
generate-kuttl: ## Generate kuttl tests
211211
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
212212
[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other

‎config/manager/manager.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ spec:
1919
- name: IVORY_DEBUG
2020
value: "true"
2121
- name: RELATED_IMAGE_IVORY_18
22-
value: "docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1"
22+
value: "docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1"
2323
- name: RELATED_IMAGE_PGADMIN
24-
value: "docker.io/ivorysql/pgadmin:ubi9-9.9-5.1-1"
24+
value: "docker.io/ivorysql/pgadmin:ubi9-9.9-5.3-1"
2525
- name: RELATED_IMAGE_PGBACKREST
26-
value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1"
26+
value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1"
2727
- name: RELATED_IMAGE_PGBOUNCER
28-
value: "docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.1-1"
28+
value: "docker.io/ivorysql/pgbouncer:ubi9-1.24.0-5.3-1"
2929
- name: RELATED_IMAGE_PGEXPORTER
30-
value: "docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.1-1"
30+
value: "docker.io/ivorysql/postgres-exporter:ubi9-0.17.0-5.3-1"
3131
- name: RELATED_IMAGE_PGUPGRADE
3232
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-5.3.1-0"
3333
- name: RELATED_IMAGE_POSTGRES_18_GIS_3.5
34-
value: "docker.io/ivorysql/ivorysql-postgis:ubi9-3.5-5.1-1"
34+
value: "docker.io/ivorysql/ivorysql-postgis:ubi9-3.5-5.3-1"
3535
securityContext:
3636
allowPrivilegeEscalation: false
3737
capabilities: { drop: [ALL] }

‎examples/ivorycluster/ivorycluster.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IvoryCluster
33
metadata:
44
name: hippo
55
spec:
6-
image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
6+
image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
77
postgresVersion: 15
88
instances:
99
- name: instance1
@@ -15,7 +15,7 @@ spec:
1515
storage: 1Gi
1616
backups:
1717
pgbackrest:
18-
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
18+
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
1919
repos:
2020
- name: repo1
2121
volume:

‎examples/kustomize/azure/ivory.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IvoryCluster
33
metadata:
44
name: hippo-azure
55
spec:
6-
image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
6+
image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
77
postgresVersion: 15
88
instances:
99
- dataVolumeClaimSpec:
@@ -14,7 +14,7 @@ spec:
1414
storage: 1Gi
1515
backups:
1616
pgbackrest:
17-
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
17+
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
1818
configuration:
1919
- secret:
2020
name: ivyo-azure-creds

‎examples/kustomize/gcs/ivory.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IvoryCluster
33
metadata:
44
name: hippo-gcs
55
spec:
6-
image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
6+
image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
77
postgresVersion: 15
88
instances:
99
- dataVolumeClaimSpec:
@@ -14,7 +14,7 @@ spec:
1414
storage: 1Gi
1515
backups:
1616
pgbackrest:
17-
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
17+
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
1818
configuration:
1919
- secret:
2020
name: ivyo-gcs-creds

‎examples/kustomize/high-availability/ha-ivory.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IvoryCluster
33
metadata:
44
name: hippo-ha
55
spec:
6-
image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
6+
image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
77
postgresVersion: 15
88
instances:
99
- name: pgha1
@@ -26,7 +26,7 @@ spec:
2626
ivory-operator.ivorysql.org/instance-set: pgha1
2727
backups:
2828
pgbackrest:
29-
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
29+
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
3030
repos:
3131
- name: repo1
3232
volume:

‎examples/kustomize/install/manager/manager.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ spec:
2727
- name: IVORY_DEBUG
2828
value: "true"
2929
- name: RELATED_IMAGE_IVORY_5
30-
value: "docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1"
30+
value: "docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1"
3131
- name: RELATED_IMAGE_PGBACKREST
32-
value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1"
32+
value: "docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1"
3333

3434
securityContext:
3535
allowPrivilegeEscalation: false

‎examples/kustomize/ivory/ivory.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IvoryCluster
33
metadata:
44
name: hippo
55
spec:
6-
image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
6+
image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
77
postgresVersion: 15
88
instances:
99
- name: instance1
@@ -15,7 +15,7 @@ spec:
1515
storage: 1Gi
1616
backups:
1717
pgbackrest:
18-
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
18+
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
1919
repos:
2020
- name: repo1
2121
volume:

‎examples/kustomize/keycloak/ivory.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IvoryCluster
33
metadata:
44
name: keycloakdb
55
spec:
6-
image: docker.io/ivorysql/ivorysql:ubi9-5.1-5.1-1
6+
image: docker.io/ivorysql/ivorysql:ubi9-5.3-5.3-1
77
postgresVersion: 15
88
instances:
99
- replicas: 2
@@ -25,7 +25,7 @@ spec:
2525
ivory-operator.ivorysql.org/instance-set: "00"
2626
backups:
2727
pgbackrest:
28-
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.1-1
28+
image: docker.io/ivorysql/pgbackrest:ubi9-2.56.0-5.3-1
2929
repos:
3030
- name: repo1
3131
volume:

0 commit comments

Comments
 (0)