Skip to content

Commit 20a1255

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #79 from balinorLiang/feature/compatible_ivorysql4.5
ivorysql opertor V4 release
2 parents ea5f367 + a64f2f2 commit 20a1255

61 files changed

Lines changed: 184 additions & 159 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- uses: golangci/golangci-lint-action@v3
5454
with:
55-
version: latest
55+
version: v1.60.1
5656
args: --timeout=5m
5757

5858
# Count issues reported by disabled linters. The command always

‎.github/workflows/test.yaml‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ on:
1010

1111
jobs:
1212
go-test:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-24.04
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-go@v3
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-go@v4
1717
with:
18-
go-version: 1.x
18+
go-version: 1.19
1919
- run: make check
2020
- run: make check-generate
2121

2222
- name: Ensure go.mod is tidy
2323
run: go mod tidy && git diff --exit-code -- go.mod
2424

2525
kubernetes-api:
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
needs: [go-test]
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
kubernetes: ['default']
31+
kubernetes: ['1.23.5']
3232
steps:
33-
- uses: actions/checkout@v3
34-
- uses: actions/setup-go@v3
33+
- uses: actions/checkout@v4
34+
- uses: actions/setup-go@v4
3535
with: { go-version: 1.x }
3636
- run: go mod download
3737
- run: ENVTEST_K8S_VERSION="${KUBERNETES#default}" make check-envtest
@@ -41,33 +41,32 @@ jobs:
4141

4242
# Upload coverage to GitHub
4343
- run: gzip envtest.coverage
44-
- uses: actions/upload-artifact@v3
44+
- uses: actions/upload-artifact@v4
4545
with:
4646
name: "kubernetes-api=${{ matrix.kubernetes }}"
4747
path: envtest.coverage.gz
4848
retention-days: 1
4949

5050
kubernetes-k3d:
51-
if: "${{ github.repository == 'IvorySQL/ivory-operator' }}"
52-
runs-on: ubuntu-20.04
51+
runs-on: ubuntu-24.04
5352
needs: [go-test]
5453
strategy:
5554
fail-fast: false
5655
matrix:
5756
kubernetes: [v1.28, v1.25]
5857
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-go@v3
58+
- uses: actions/checkout@v4
59+
- uses: actions/setup-go@v4
6160
with: { go-version: 1.x }
6261

6362
- name: Start k3s
6463
uses: ./.github/actions/k3d
6564
with:
6665
k3s-channel: "${{ matrix.kubernetes }}"
6766
prefetch-images: |
68-
docker.io/ivorysql/pgbackrest:ubi8-2.47-2.0-1
69-
docker.io/ivorysql/pgbouncer:ubi8-1.21-2.0-1
70-
docker.io/ivorysql/ivorysql:ubi8-3.0-2.0-1
67+
docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1
68+
docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1
69+
docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
7170
7271
- run: make createnamespaces check-envtest-existing
7372
env:
@@ -76,35 +75,35 @@ jobs:
7675

7776
# Upload coverage to GitHub
7877
- run: gzip envtest-existing.coverage
79-
- uses: actions/upload-artifact@v3
78+
- uses: actions/upload-artifact@v4
8079
with:
8180
name: "kubernetes-k3d=${{ matrix.kubernetes }}"
8281
path: envtest-existing.coverage.gz
8382
retention-days: 1
8483

8584
kuttl-k3d:
86-
runs-on: ubuntu-20.04
85+
runs-on: ubuntu-24.04
8786
needs: [go-test]
8887
strategy:
8988
fail-fast: false
9089
matrix:
9190
kubernetes: [v1.25, v1.24, v1.23, v1.22, v1.21]
9291
steps:
93-
- uses: actions/checkout@v3
94-
- uses: actions/setup-go@v3
92+
- uses: actions/checkout@v4
93+
- uses: actions/setup-go@v4
9594
with: { go-version: 1.x }
9695

9796
- name: Start k3s
9897
uses: ./.github/actions/k3d
9998
with:
10099
k3s-channel: "${{ matrix.kubernetes }}"
101100
prefetch-images: |
102-
docker.io/ivorysql/pgadmin:ubi8-8.0-2.0-1
103-
docker.io/ivorysql/pgbackrest:ubi8-2.47-2.0-1
104-
docker.io/ivorysql/pgbouncer:ubi8-1.21-2.0-1
105-
docker.io/ivorysql/postgres-exporter:ubi8-0.15.0-2.0-1
106-
docker.io/ivorysql/ivorysql:ubi8-3.0-2.0-1
107-
docker.io/ivorysql/postgis:ubi8-3.4-2.0-1
101+
docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1
102+
docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1
103+
docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1
104+
docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1
105+
docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
106+
docker.io/ivorysql/postgis:ubi8-3.4-4.0-1
108107
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0
109108
- run: go mod download
110109
- name: Build executable
@@ -119,13 +118,13 @@ jobs:
119118
docker run --detach --network host --read-only \
120119
--volume "$(pwd):/mnt" --workdir '/mnt' --env 'PATH=/mnt/bin' \
121120
--env 'KUBECONFIG=hack/.kube/ivory-operator/ivyo' \
122-
--env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi8-8.0-2.0-1' \
123-
--env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi8-2.47-2.0-1' \
124-
--env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi8-1.21-2.0-1' \
125-
--env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi8-0.15.0-2.0-1' \
121+
--env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1' \
122+
--env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1' \
123+
--env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1' \
124+
--env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1' \
126125
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0' \
127-
--env 'RELATED_IMAGE_IVORY_16=docker.io/ivorysql/ivorysql:ubi8-3.0-2.0-1' \
128-
--env 'RELATED_IMAGE_IVORY_16_GIS_3.4=docker.io/ivorysql/postgis:ubi8-3.4-2.0-1' \
126+
--env 'RELATED_IMAGE_IVORY_17=docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1' \
127+
--env 'RELATED_IMAGE_IVORY_17_GIS_3.4=docker.io/ivorysql/postgis:ubi8-3.4-4.0-1' \
129128
--env 'IVYO_FEATURE_GATES=TablespaceVolumes=true' \
130129
--name 'ivory-operator' ubuntu \
131130
ivory-operator
@@ -136,11 +135,11 @@ jobs:
136135
137136
- run: make generate-kuttl
138137
env:
139-
KUTTL_PG_UPGRADE_FROM_VERSION: '16'
140-
KUTTL_PG_UPGRADE_TO_VERSION: '16'
141-
KUTTL_PG_VERSION: '16'
138+
KUTTL_PG_UPGRADE_FROM_VERSION: '17'
139+
KUTTL_PG_UPGRADE_TO_VERSION: '17'
140+
KUTTL_PG_VERSION: '17'
142141
KUTTL_POSTGIS_VERSION: '3.4'
143-
KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi8-3.0-2.0-1'
142+
KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1'
144143
- run: |
145144
make check-kuttl && exit
146145
failed=$?
@@ -158,10 +157,10 @@ jobs:
158157
- kubernetes-api
159158
- kubernetes-k3d
160159
steps:
161-
- uses: actions/checkout@v3
162-
- uses: actions/setup-go@v3
160+
- uses: actions/checkout@v4
161+
- uses: actions/setup-go@v4
163162
with: { go-version: 1.x }
164-
- uses: actions/download-artifact@v3
163+
- uses: actions/download-artifact@v4
165164
with: { path: download }
166165

167166
# Combine the coverage profiles by taking the mode line from any one file
@@ -185,7 +184,7 @@ jobs:
185184
186185
# Upload coverage to GitHub
187186
- run: gzip total-coverage.html
188-
- uses: actions/upload-artifact@v3
187+
- uses: actions/upload-artifact@v4
189188
with:
190189
name: coverage-report
191190
path: total-coverage.html.gz

‎config/crd/bases/ivory-operator.ivorysql.org_ivoryclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10468,7 +10468,7 @@ spec:
1046810468
postgresVersion:
1046910469
description: The major version of PostgreSQL installed in the PostgreSQL
1047010470
image
10471-
maximum: 16
10471+
maximum: 17
1047210472
minimum: 10
1047310473
type: integer
1047410474
proxy:

‎config/crd/bases/ivory-operator.ivorysql.org_ivyupgrades.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ spec:
857857
type: object
858858
fromIvoryVersion:
859859
description: The major version of IvorySQL before the upgrade.
860-
maximum: 16
860+
maximum: 17
861861
minimum: 10
862862
type: integer
863863
image:
@@ -936,7 +936,7 @@ spec:
936936
type: string
937937
toIvoryVersion:
938938
description: The major version of IvorySQL to be upgraded to.
939-
maximum: 16
939+
maximum: 17
940940
minimum: 10
941941
type: integer
942942
tolerations:

‎config/default/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ bases:
1111

1212
images:
1313
- name: ivory-operator
14-
newName: docker.io/balinor2017/ivory-operator
15-
newTag: v0.4
14+
newName: docker.io/ivorysql/ivory-operator
15+
newTag: v4.0

‎config/manager/manager.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ spec:
1919
- name: IVORY_DEBUG
2020
value: "true"
2121
- name: RELATED_IMAGE_IVORY_16
22-
value: "docker.io/ivorysql/ivorysql:ubi8-3.0-2.0-1"
22+
value: "docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1"
2323
- name: RELATED_IMAGE_PGADMIN
24-
value: "docker.io/ivorysql/pgadmin:ubi8-8.0-2.0-1"
24+
value: "docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1"
2525
- name: RELATED_IMAGE_PGBACKREST
26-
value: "docker.io/ivorysql/pgbackrest:ubi8-2.47-2.0-1"
26+
value: "docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1"
2727
- name: RELATED_IMAGE_PGBOUNCER
28-
value: "docker.io/ivorysql/pgbouncer:ubi8-1.21-2.0-1"
28+
value: "docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1"
2929
- name: RELATED_IMAGE_PGEXPORTER
30-
value: "docker.io/ivorysql/postgres-exporter:ubi8-0.15.0-2.0-1"
30+
value: "docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1"
3131
- name: RELATED_IMAGE_PGUPGRADE
3232
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0"
3333
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.4

‎config/singlenamespace/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ patches:
1313

1414
images:
1515
- name: ivory-operator
16-
newName: docker.io/balinor2017/ivory-operator
17-
newTag: v0.4
16+
newName: docker.io/ivorysql/ivory-operator
17+
newTag: v4.0

‎examples/kustomize/install/crd/bases/ivory-operator.ivorysql.org_ivoryclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10468,7 +10468,7 @@ spec:
1046810468
postgresVersion:
1046910469
description: The major version of PostgreSQL installed in the PostgreSQL
1047010470
image
10471-
maximum: 16
10471+
maximum: 17
1047210472
minimum: 10
1047310473
type: integer
1047410474
proxy:

‎examples/kustomize/install/default/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bases:
1313
images:
1414
- name: ivory-operator
1515
newName: docker.io/ivorysql/ivory-operator
16-
newTag: v1.1
16+
newTag: v4.0
1717

1818
patchesJson6902:
1919
- target: { group: apps, version: v1, kind: Deployment, name: ivyo }

‎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_3
30-
value: "docker.io/ivorysql/ivorysql:ubi8-3.0-2.0-1"
30+
value: "docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1"
3131
- name: RELATED_IMAGE_PGBACKREST
32-
value: "docker.io/ivorysql/pgbackrest:ubi8-2.47-2.0-1"
32+
value: "docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1"
3333

3434
securityContext:
3535
allowPrivilegeEscalation: false

0 commit comments

Comments
 (0)