Skip to content

update for ivyo 5.0 #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaoxueyu merged 2 commits into from
Nov 24, 2025
Merged

update for ivyo 5.0 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d242d09
update for ivyo 5.0
jiaoshuntian Nov 20, 2025
e67969d
update LD_PRELOAD for ivyo 5.0
jiaoshuntian Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ jobs:
with:
k3s-channel: "${{ matrix.kubernetes }}"
prefetch-images: |
docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1
docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1
docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
docker.io/ivorysql/pgbackrest:ubi8-2.56.0-5.0-1
docker.io/ivorysql/pgbouncer:ubi8-1.23.0-5.0-1
docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1

- run: make createnamespaces check-envtest-existing
env:
Expand Down Expand Up @@ -98,12 +98,12 @@ jobs:
with:
k3s-channel: "${{ matrix.kubernetes }}"
prefetch-images: |
docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1
docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1
docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1
docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1
docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
docker.io/ivorysql/postgis:ubi8-3.4-4.0-1
docker.io/ivorysql/pgadmin:ubi8-9.9-5.0-1
docker.io/ivorysql/pgbackrest:ubi8-2.56.0-5.0-1
docker.io/ivorysql/pgbouncer:ubi8-1.23.0-5.0-1
docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-5.0-1
docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1
docker.io/ivorysql/postgis:ubi8-3.5-5.0-1
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0
- run: go mod download
- name: Build executable
Expand All @@ -118,13 +118,13 @@ jobs:
docker run --detach --network host --read-only \
--volume "$(pwd):/mnt" --workdir '/mnt' --env 'PATH=/mnt/bin' \
--env 'KUBECONFIG=hack/.kube/ivory-operator/ivyo' \
--env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1' \
--env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1' \
--env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1' \
--env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1' \
--env 'RELATED_IMAGE_PGADMIN=docker.io/ivorysql/pgadmin:ubi8-9.9-5.0-1' \
--env 'RELATED_IMAGE_PGBACKREST=docker.io/ivorysql/pgbackrest:ubi8-2.56.0-5.0-1' \
--env 'RELATED_IMAGE_PGBOUNCER=docker.io/ivorysql/pgbouncer:ubi8-1.23.0-5.0-1' \
--env 'RELATED_IMAGE_PGEXPORTER=docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-5.0-1' \
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0' \
--env 'RELATED_IMAGE_IVORY_17=docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1' \
--env 'RELATED_IMAGE_IVORY_17_GIS_3.4=docker.io/ivorysql/postgis:ubi8-3.4-4.0-1' \
--env 'RELATED_IMAGE_IVORY_18=docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1' \
--env 'RELATED_IMAGE_IVORY_18_GIS_3.5=docker.io/ivorysql/postgis:ubi8-3.5-5.0-1' \
--env 'IVYO_FEATURE_GATES=TablespaceVolumes=true' \
--name 'ivory-operator' ubuntu \
ivory-operator
Expand All @@ -135,11 +135,11 @@ jobs:

- run: make generate-kuttl
env:
KUTTL_PG_UPGRADE_FROM_VERSION: '17'
KUTTL_PG_UPGRADE_TO_VERSION: '17'
KUTTL_PG_VERSION: '17'
KUTTL_POSTGIS_VERSION: '3.4'
KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1'
KUTTL_PG_UPGRADE_FROM_VERSION: '18'
KUTTL_PG_UPGRADE_TO_VERSION: '18'
KUTTL_PG_VERSION: '18'
KUTTL_POSTGIS_VERSION: '3.5'
KUTTL_IVORY_IMAGE: 'docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1'
- run: |
make check-kuttl && exit
failed=$?
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/ivory-operator.ivorysql.org_ivoryclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10468,7 +10468,7 @@ spec:
postgresVersion:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 17
maximum: 18
minimum: 10
type: integer
proxy:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/ivory-operator.ivorysql.org_ivyupgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ spec:
type: object
fromIvoryVersion:
description: The major version of IvorySQL before the upgrade.
maximum: 17
maximum: 18
minimum: 10
type: integer
image:
Expand Down Expand Up @@ -936,7 +936,7 @@ spec:
type: string
toIvoryVersion:
description: The major version of IvorySQL to be upgraded to.
maximum: 17
maximum: 18
minimum: 10
type: integer
tolerations:
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ bases:
images:
- name: ivory-operator
newName: docker.io/ivorysql/ivory-operator
newTag: v4.0
newTag: v5.0
16 changes: 8 additions & 8 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ spec:
fieldPath: metadata.namespace
- name: IVORY_DEBUG
value: "true"
- name: RELATED_IMAGE_IVORY_16
value: "docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1"
- name: RELATED_IMAGE_IVORY_18
value: "docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1"
- name: RELATED_IMAGE_PGADMIN
value: "docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1"
value: "docker.io/ivorysql/pgadmin:ubi8-9.9-5.0-1"
- name: RELATED_IMAGE_PGBACKREST
value: "docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1"
value: "docker.io/ivorysql/pgbackrest:ubi8-2.56.0-5.0-1"
- name: RELATED_IMAGE_PGBOUNCER
value: "docker.io/ivorysql/pgbouncer:ubi8-1.23.0-4.0-1"
value: "docker.io/ivorysql/pgbouncer:ubi8-1.23.0-5.0-1"
- name: RELATED_IMAGE_PGEXPORTER
value: "docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1"
value: "docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-5.0-1"
- name: RELATED_IMAGE_PGUPGRADE
value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.1-0"
- name: RELATED_IMAGE_POSTGRES_16_GIS_3.4
value: "docker.io/ivorysql/ivorysql-postgis:ubi8-3.4-2.0-1"
- name: RELATED_IMAGE_POSTGRES_18_GIS_3.5
value: "docker.io/ivorysql/ivorysql-postgis:ubi8-3.5-5.0-1"
securityContext:
allowPrivilegeEscalation: false
capabilities: { drop: [ALL] }
Expand Down
2 changes: 1 addition & 1 deletion config/singlenamespace/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ patches:
images:
- name: ivory-operator
newName: docker.io/ivorysql/ivory-operator
newTag: v4.0
newTag: v5.0
2 changes: 1 addition & 1 deletion examples/kustomize/install/crd/bases/ivory-operator.ivorysql.org_ivoryclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10468,7 +10468,7 @@ spec:
postgresVersion:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 17
maximum: 18
minimum: 10
type: integer
proxy:
Expand Down
2 changes: 1 addition & 1 deletion examples/kustomize/install/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bases:
images:
- name: ivory-operator
newName: docker.io/ivorysql/ivory-operator
newTag: v4.0
newTag: v5.0

patchesJson6902:
- target: { group: apps, version: v1, kind: Deployment, name: ivyo }
Expand Down
6 changes: 3 additions & 3 deletions examples/kustomize/install/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ spec:
fieldPath: metadata.namespace
- name: IVORY_DEBUG
value: "true"
- name: RELATED_IMAGE_IVORY_3
value: "docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1"
- name: RELATED_IMAGE_IVORY_5
value: "docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1"
- name: RELATED_IMAGE_PGBACKREST
value: "docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1"
value: "docker.io/ivorysql/pgbackrest:ubi8-2.56.0-5.0-1"

securityContext:
allowPrivilegeEscalation: false
Expand Down
2 changes: 1 addition & 1 deletion examples/kustomize/install/singlenamespace/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bases:
images:
- name: ivory-operator
newName: docker.io/ivorysql/ivory-operator
newTag: v4.0
newTag: v5.0

patchesJson6902:
- target: { group: apps, version: v1, kind: Deployment, name: ivyo }
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/ivorycluster/pgbackrest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/selection"

Check failure on line 45 in internal/controller/ivorycluster/pgbackrest_test.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

could not import k8s.io/apimachinery/pkg/selection (-: could not load export data: internal error in importing "k8s.io/apimachinery/pkg/selection" (unsupported version: 2); please report an issue) (typecheck)
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/rand"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -2102,7 +2102,7 @@
result: testResult{
configCount: 1, jobCount: 1, pvcCount: 1,
expectedClusterCondition: nil,
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n\n [db]\n pg-version-force = 17\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n\n [db]\n pg-version-force = 18\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
},
}, {
desc: "global/configuration set",
Expand All @@ -2119,7 +2119,7 @@
result: testResult{
configCount: 1, jobCount: 1, pvcCount: 1,
expectedClusterCondition: nil,
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = elephant\n\n [db]\n pg-version-force = 17\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = elephant\n\n [db]\n pg-version-force = 18\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
},
}, {
desc: "invalid option: stanza",
Expand All @@ -2134,7 +2134,7 @@
result: testResult{
configCount: 1, jobCount: 0, pvcCount: 1,
expectedClusterCondition: nil,
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n\n [db]\n pg-version-force = 17\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n\n [db]\n pg-version-force = 18\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
},
}, {
desc: "cluster bootstrapped init condition missing",
Expand All @@ -2153,7 +2153,7 @@
Reason: "ClusterAlreadyBootstrapped",
Message: "The cluster is already bootstrapped",
},
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n\n [db]\n pg-version-force = 17\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
conf: "|\n # Generated by ivory-operator. DO NOT EDIT.\n # Your changes will not be saved.\n\n [global]\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n\n [db]\n pg-version-force = 18\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n",
},
}}

Expand Down
4 changes: 2 additions & 2 deletions internal/controller/ivorycluster/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ NSS_WRAPPER_DIR="/tmp/nss_wrapper/${NSS_WRAPPER_SUBDIR}"
NSS_WRAPPER_PASSWD="${NSS_WRAPPER_DIR}/passwd"
NSS_WRAPPER_GROUP="${NSS_WRAPPER_DIR}/group"

export LD_PRELOAD=/usr/lib64/libnss_wrapper.so:/lib64/libssl.so.1.1:/lib64/libcrypto.so.1.1
export LD_PRELOAD=/usr/lib64/libnss_wrapper.so
export NSS_WRAPPER_PASSWD="${NSS_WRAPPER_PASSWD}"
export NSS_WRAPPER_GROUP="${NSS_WRAPPER_GROUP}"

Expand Down Expand Up @@ -194,7 +194,7 @@ func addNSSWrapper(image string, imagePullPolicy corev1.PullPolicy, template *co
passwd := fmt.Sprintf(nssWrapperDir, "ivory", "passwd")
group := fmt.Sprintf(nssWrapperDir, "ivory", "group")
template.Spec.Containers[i].Env = append(template.Spec.Containers[i].Env, []corev1.EnvVar{
{Name: "LD_PRELOAD", Value: "/usr/lib64/libnss_wrapper.so:/lib64/libssl.so.1.1:/lib64/libcrypto.so.1.1"},
{Name: "LD_PRELOAD", Value: "/usr/lib64/libnss_wrapper.so"},
{Name: "NSS_WRAPPER_PASSWD", Value: passwd},
{Name: "NSS_WRAPPER_GROUP", Value: group},
}...)
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/ivorycluster/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func TestAddNSSWrapper(t *testing.T) {
}}

expectedEnv := []corev1.EnvVar{
{Name: "LD_PRELOAD", Value: "/usr/lib64/libnss_wrapper.so:/lib64/libssl.so.1.1:/lib64/libcrypto.so.1.1"},
{Name: "LD_PRELOAD", Value: "/usr/lib64/libnss_wrapper.so"},
{Name: "NSS_WRAPPER_PASSWD", Value: "/tmp/nss_wrapper/ivory/passwd"},
{Name: "NSS_WRAPPER_GROUP", Value: "/tmp/nss_wrapper/ivory/group"},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/pgbackrest/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ func populatePGInstanceConfigurationMap(
stanza.Set("pg1-path", pgdataDir)
stanza.Set("pg1-port", fmt.Sprint(pgPort))
stanza.Set("pg1-socket-path", ivory.SocketDirectory)
stanza.Set("pg-version-force", "17")
stanza.Set("pg-version-force", "18")
Copy link

@coderabbitai coderabbitai bot Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Consider deriving the PostgreSQL version dynamically rather than hardcoding.

The pg-version-force parameter is now hardcoded to "18". This could cause issues if:

  • Different clusters run different PostgreSQL major versions
  • Future version upgrades require updating this hardcoded value in multiple places

Consider whether this should be derived from the cluster's actual PostgresVersion field or defined as a package-level constant.

Verify if there are other locations where PostgreSQL version 18 is hardcoded:

🏁 Script executed:

#!/bin/bash
# Search for hardcoded references to PostgreSQL version 18
rg -n '"18"' internal/pgbackrest/ --type go

Length of output: 71

I'll verify the scope and context of this hardcoding issue more thoroughly.

🏁 Script executed:

#!/bin/bash
# Search for all "18" references in the entire codebase
rg -n '"18"' --type go -C 2

Length of output: 357

🏁 Script executed:

#!/bin/bash
# Search for PostgresVersion usage in the codebase
rg -n 'PostgresVersion' --type go -C 2

Length of output: 13683

🏁 Script executed:

#!/bin/bash
# Get context around line 313 in config.go
sed -n '300,330p' internal/pgbackrest/config.go

Length of output: 961

🏁 Script executed:

#!/bin/bash
# Search for pg-version-force in the codebase to understand usage pattern
rg -n 'pg-version-force' --type go -C 2

Length of output: 5384

I need to see the complete function signature to determine if the cluster information is available.


---

🏁 Script executed:

```shell
#!/bin/bash
# Find the function definition containing line 313
sed -n '280,315p' internal/pgbackrest/config.go | head -50

Length of output: 1522

🏁 Script executed:

#!/bin/bash
# Get broader context to see function signature
sed -n '260,320p' internal/pgbackrest/config.go

Length of output: 2367

Now I need to find where this function is called to understand how to pass the PostgreSQL version.


---

🏁 Script executed:

```shell
#!/bin/bash
# Find all calls to populatePGInstanceConfigurationMap
rg -n 'populatePGInstanceConfigurationMap' --type go -B 2 -A 5

Length of output: 1241

Hardcode at line 313 needs to be replaced with dynamic version from cluster specification.

The function populatePGInstanceConfigurationMap is called from line 108 with access to ivoryCluster.Spec.PostgresVersion, but the function signature lacks a version parameter. Add postgresVersion int to the function signature and pass ivoryCluster.Spec.PostgresVersion from the call site. Then replace the hardcoded "18" at line 313 with strconv.Itoa(postgresVersion).

This aligns with the existing pattern used in internal/controller/ivorycluster/pgbackrest.go:679, where --pg-version-force is set dynamically to strconv.Itoa(ivoryCluster.Spec.PostgresVersion).

🤖 Prompt for AI Agents 
In internal/pgbackrest/config.go around line 313, replace the hardcoded
stanza.Set("pg-version-force", "18") by making
populatePGInstanceConfigurationMap accept a postgresVersion int parameter (add
it to the function signature), use strconv.Itoa(postgresVersion) for the value,
and update the call site where populatePGInstanceConfigurationMap is invoked
(from where it was called at line 108) to pass
ivoryCluster.Spec.PostgresVersion; ensure strconv is imported if not already.

return iniSectionSet{
"global": global,
DefaultStanzaName: stanza,
Expand Down
2 changes: 1 addition & 1 deletion internal/pgbackrest/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ repo4-s3-region = earth
repo4-type = s3

[db]
pg-version-force = 17
pg-version-force = 18
pg1-path = /pgdata/pg12
pg1-port = 2345
pg1-socket-path = /tmp/postgres
Expand Down
2 changes: 1 addition & 1 deletion internal/pgbackrest/pgbackrest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ declare -r hash="$1" stanza="$2" message="$3" cmd="$4"
if [[ "$(< /etc/pgbackrest/conf.d/config-hash)" != "${hash}" ]]; then
printf >&2 "%s" "${message}"; exit 1;
else
pgbackrest "${cmd}" --pg-version-force=17 --stanza="${stanza}"
pgbackrest "${cmd}" --pg-version-force=18 --stanza="${stanza}"
Copy link

@coderabbitai coderabbitai bot Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Verify that hardcoded pg-version-force=18 doesn't break support for PostgreSQL versions 10-17.

The pgBackRest stanza creation script now forces PostgreSQL version 18 for all clusters. Since the operator supports PostgreSQL versions 10-18 (per CRD validation), forcing version 18 for clusters running older versions could potentially cause compatibility issues or unexpected behavior.

Run the following script to verify how pg-version-force is used across the codebase and whether it should be dynamic based on the cluster's actual version:

🏁 Script executed:

#!/bin/bash
# Search for pg-version-force usage and postgresVersion references

echo "=== Searching for pg-version-force usage ==="
rg -n "pg-version-force" --type go -C 3

echo -e "\n=== Searching for postgresVersion field usage in pgbackrest context ==="
rg -n "postgresVersion" internal/pgbackrest/ -C 3

echo -e "\n=== Checking if version is passed to pgbackrest functions ==="
ast-grep --pattern 'func $_(ctx context.Context, $$$) {
  $$$
  pgbackrest $$$
  $$$
}'

Length of output: 7396

I need to gather more context about how the cluster version is passed to the pgbackrest functions and understand the flow between the hardcoded values and the dynamic version handling.

Now let me search for function signatures in pgbackrest.go to understand how it's called and whether version info is available:

Let me search for the function that uses the pgbackrest.go script and config functions to understand the flow:


Based on my comprehensive analysis, I've identified a **critical breaking issue** with hardcoding the PostgreSQL version to 18:

**The hardcoded pg-version-force=18 breaks compatibility with PostgreSQL 10-17.**

The version reported by PostgreSQL via `server_version_num` must match the forced version. The evidence shows:

1. **Two locations hardcode version 18:**
   - `internal/pgbackrest/config.go:313` sets `pg-version-force = "18"`
   - `internal/pgbackrest/pgbackrest.go:73` uses `--pg-version-force=18` in the bash wrapper

2. **Dynamic version handling exists elsewhere:**
   - `internal/controller/ivorycluster/pgbackrest.go:679` correctly uses `--pg-version-force=` + `ivoryCluster.Spec.PostgresVersion` for backup jobs
   - Tests show dynamic version expectations (e.g., `--pg-version-force=13` for PostgreSQL 12)

3. **This violates pgBackRest's requirement:**
   pg-version-force value should be set to the same major version number as the server reports when using show server_version_num in PSQL. Forcing version 18 for clusters running PostgreSQL 10-17 will cause stanza operations to fail.

The review comment's concern is valid: this change breaks support for PostgreSQL 10-17 clusters by forcing all pgBackRest stanza operations to use version 18, which will cause version mismatch errors.

**Update `internal/pgbackrest/config.go:313` and `internal/pgbackrest/pgbackrest.go:73` to use dynamic PostgreSQL version instead of hardcoded 18. The version should be passed as a parameter from the cluster specification, matching the approach in `internal/controller/ivorycluster/pgbackrest.go:679`.**

---

🏁 Script executed:

```shell
#!/bin/bash

echo "=== Looking for functions that call pgbackrest.go functions ==="
rg -n "func.*Stanza" internal/pgbackrest/pgbackrest.go -A 5

echo -e "\n=== Searching for callers of CreateStanza or similar functions ==="
rg -n "CreateStanza\|NewStanzaCommand" --type go -B 2 -A 2

echo -e "\n=== Looking at config.go to see function signatures ==="
rg -n "func.*Config\|func.*Stanza" internal/pgbackrest/config.go -A 3 | head -50

Length of output: 378


---

🏁 Script executed:

```shell
#!/bin/bash

echo "=== Getting full StanzaCreateOrUpgrade function ==="
sed -n '53,120p' internal/pgbackrest/pgbackrest.go

echo -e "\n=== Searching for callers of StanzaCreateOrUpgrade ==="
rg -n "StanzaCreateOrUpgrade" --type go -B 3 -A 3

echo -e "\n=== Getting function signatures in config.go ==="
sed -n '1,50p' internal/pgbackrest/config.go | grep -n "func"
rg -n "^func" internal/pgbackrest/config.go -A 2

Length of output: 6875


---

🏁 Script executed:

```shell
#!/bin/bash

echo "=== Finding function containing call to StanzaCreateOrUpgrade at line 2604 ==="
sed -n '2550,2620p' internal/controller/ivorycluster/pgbackrest.go

echo -e "\n=== Looking for callers of this function in controller ==="
rg -n "reconcile.*Stanza\|func.*reconcile" internal/controller/ivorycluster/pgbackrest.go -B 2 -A 10 | head -80

Length of output: 3028


---

🏁 Script executed:

```shell
#!/bin/bash

echo "=== Finding function signature containing StanzaCreateOrUpgrade call ==="
rg -n "func.*{" internal/controller/ivorycluster/pgbackrest.go | awk -F: '{print $1}' | while read line; do
  next_line=$((line + 100))
  if sed -n "${line}p" internal/controller/ivorycluster/pgbackrest.go | grep -q "reconcile\|Stanza"; then
    if sed -n "${line},${next_line}p" internal/controller/ivorycluster/pgbackrest.go | grep -q "StanzaCreateOrUpgrade"; then
      echo "Function starting at line $line:"
      sed -n "${line},$((line+3))p" internal/controller/ivorycluster/pgbackrest.go
    fi
  fi
done

echo -e "\n=== Alternative: search around line 2604 ==="
sed -n '2450,2470p' internal/controller/ivorycluster/pgbackrest.go

echo -e "\n=== Look for reconcile function that calls stanza operations ==="
rg -n "func.*reconcile.*{" internal/controller/ivorycluster/pgbackrest.go -A 2

Length of output: 934


---

🏁 Script executed:

```shell
#!/bin/bash

echo "=== Finding function containing line 2604 ==="
grep -n "func" internal/controller/ivorycluster/pgbackrest.go | awk -F: '{if ($1 < 2604) print}' | tail -1

echo -e "\n=== Get that function signature ==="
line_num=$(grep -n "func" internal/controller/ivorycluster/pgbackrest.go | awk -F: '{if ($1 < 2604) print $1}' | tail -1)
sed -n "${line_num},$((line_num+2))p" internal/controller/ivorycluster/pgbackrest.go

echo -e "\n=== Check if ivoryCluster is available in that function ==="
sed -n "${line_num},2604p" internal/controller/ivorycluster/pgbackrest.go | grep -i "ivorycluster" | head -5

echo -e "\n=== Get the config hash creation to see if version could be passed ==="
sed -n '2450,2610p' internal/controller/ivorycluster/pgbackrest.go | head -100

Length of output: 4321

Pass PostgreSQL version dynamically instead of hardcoding version 18 in pgBackRest stanza configuration and script.

The hardcoded pg-version-force=18 breaks support for PostgreSQL 10-17 clusters. pgBackRest requires the forced version to match the actual cluster version reported via server_version_num. This causes stanza-create and stanza-upgrade operations to fail with version mismatch errors.

Required changes:

  • internal/pgbackrest/config.go:313: Use ivoryCluster.Spec.PostgresVersion instead of hardcoding "18"
  • internal/pgbackrest/pgbackrest.go:73: Pass PostgreSQL version as a parameter to the bash script instead of hardcoding --pg-version-force=18
  • internal/pgbackrest/pgbackrest.go:53 (StanzaCreateOrUpgrade): Add version parameter and pass it to the script

The reconcileStanzaCreate function at internal/controller/ivorycluster/pgbackrest.go:2567 already has access to ivoryCluster.Spec.PostgresVersion and must pass it through the call chain.

🤖 Prompt for AI Agents 
In internal/pgbackrest/pgbackrest.go around line 73,
internal/pgbackrest/config.go at line 313, and internal/pgbackrest/pgbackrest.go
around line 53 (StanzaCreateOrUpgrade), replace the hardcoded
"--pg-version-force=18" with a dynamic value taken from
IvoryCluster.Spec.PostgresVersion: update config.go to reference
ivoryCluster.Spec.PostgresVersion instead of the string "18"; modify
StanzaCreateOrUpgrade to accept a postgresVersion parameter and pass that into
the script call; and change the bash invocation at line 73 to use the passed
postgresVersion value (e.g. --pg-version-force=<postgresVersion>) so
reconcileStanzaCreate (internal/controller/ivorycluster/pgbackrest.go:2567) can
forward ivoryCluster.Spec.PostgresVersion through the call chain.

fi
`
if err := exec(ctx, nil, &stdout, &stderr, "bash", "-ceu", "--",
Expand Down
2 changes: 1 addition & 1 deletion internal/pgbackrest/pgbackrest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ declare -r hash="$1" stanza="$2" message="$3" cmd="$4"
if [[ "$(< /etc/pgbackrest/conf.d/config-hash)" != "${hash}" ]]; then
printf >&2 "%s" "${message}"; exit 1;
else
pgbackrest "${cmd}" --pg-version-force=17 --stanza="${stanza}"
pgbackrest "${cmd}" --pg-version-force=18 --stanza="${stanza}"
fi
`,
"-", "7f5d4d5bdc", "db", "ivory operator error: pgBackRest config hash mismatch",
Expand Down
15 changes: 14 additions & 1 deletion ivyo_release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,17 @@
- timescaledb 2.17.2
- wal2json 2.6
- pgnodemx 1.7

## IvorySQL Operator 5.0
- 数据库版本支持**ivorysql 5.0**
- 组件版本升级
- pgBackrest 2.56
- PgBouncer 1.23.0
- Patroni 4.0.7
- pgAdmin4 9.9
- pgExporter 0.17.0
- 插件版本升级
- PostGIS 3.5.4
- pgaudit 18.0
- pg_cron 1.6.7
- wal2json 2.6
- pgnodemx 1.7
Comment on lines +46 to +59
Copy link

@coderabbitai coderabbitai bot Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Fix markdown formatting: inconsistent indentation and hard tabs.

The new release notes section uses inconsistent indentation (4 spaces and tabs) instead of the standard 2-space indentation used in previous sections.

Apply this diff to fix the formatting:

 ## IvorySQL Operator 5.0
 - 数据库版本支持**ivorysql 5.0**
 - 组件版本升级
-    - pgBackrest 2.56
-    - PgBouncer 1.23.0
-    - Patroni 4.0.7
-    - pgAdmin4 9.9
-    - pgExporter 0.17.0
+  - pgBackrest 2.56
+  - PgBouncer 1.23.0
+  - Patroni 4.0.7
+  - pgAdmin4 9.9
+  - pgExporter 0.17.0
 - 插件版本升级
-	- PostGIS 3.5.4
-	- pgaudit 18.0
-	- pg_cron 1.6.7
-	- wal2json 2.6
-	- pgnodemx 1.7
+  - PostGIS 3.5.4
+  - pgaudit 18.0
+  - pg_cron 1.6.7
+  - wal2json 2.6
+  - pgnodemx 1.7
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
## IvorySQL Operator 5.0
- 数据库版本支持**ivorysql 5.0**
- 组件版本升级
- pgBackrest 2.56
- PgBouncer 1.23.0
- Patroni 4.0.7
- pgAdmin4 9.9
- pgExporter 0.17.0
- 插件版本升级
- PostGIS 3.5.4
- pgaudit 18.0
- pg_cron 1.6.7
- wal2json 2.6
- pgnodemx 1.7
## IvorySQL Operator 5.0
- 数据库版本支持**ivorysql 5.0**
- 组件版本升级
- pgBackrest 2.56
- PgBouncer 1.23.0
- Patroni 4.0.7
- pgAdmin4 9.9
- pgExporter 0.17.0
- 插件版本升级
- PostGIS 3.5.4
- pgaudit 18.0
- pg_cron 1.6.7
- wal2json 2.6
- pgnodemx 1.7
🧰 Tools
🪛 markdownlint-cli2 (0.18.1)

49-49: Unordered list indentation
Expected: 2; Actual: 4

(MD007, ul-indent)

50-50: Unordered list indentation
Expected: 2; Actual: 4

(MD007, ul-indent)

51-51: Unordered list indentation
Expected: 2; Actual: 4

(MD007, ul-indent)

52-52: Unordered list indentation
Expected: 2; Actual: 4

(MD007, ul-indent)

53-53: Unordered list indentation
Expected: 2; Actual: 4

(MD007, ul-indent)

55-55: Unordered list indentation
Expected: 2; Actual: 1

(MD007, ul-indent)

55-55: Hard tabs
Column: 1

(MD010, no-hard-tabs)

56-56: Unordered list indentation
Expected: 2; Actual: 1

(MD007, ul-indent)

56-56: Hard tabs
Column: 1

(MD010, no-hard-tabs)

57-57: Unordered list indentation
Expected: 2; Actual: 1

(MD007, ul-indent)

57-57: Hard tabs
Column: 1

(MD010, no-hard-tabs)

58-58: Unordered list indentation
Expected: 2; Actual: 1

(MD007, ul-indent)

58-58: Hard tabs
Column: 1

(MD010, no-hard-tabs)

59-59: Unordered list indentation
Expected: 2; Actual: 1

(MD007, ul-indent)

59-59: Hard tabs
Column: 1

(MD010, no-hard-tabs)

🤖 Prompt for AI Agents 
In ivyo_release_notes.md around lines 46 to 59, the "IvorySQL Operator 5.0"
section uses inconsistent indentation (mix of 4 spaces and hard tabs) which
breaks the repository's 2-space markdown style; normalize all list indentation
to 2 spaces per level, replace hard tabs with two spaces, and ensure sub-list
items (components and plugins) are indented exactly two spaces under the main
bullet so spacing is consistent with the rest of the document.

2 changes: 1 addition & 1 deletion pkg/apis/ivory-operator.ivorysql.org/v1beta1/ivorycluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ type IvoryClusterSpec struct {
// The major version of PostgreSQL installed in the PostgreSQL image
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=10
// +kubebuilder:validation:Maximum=17
// +kubebuilder:validation:Maximum=18
// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1
PostgresVersion int `json:"postgresVersion"`
Comment on lines +126 to 128
Copy link

@coderabbitai coderabbitai bot Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Verify PostgreSQL/IvorySQL version 18 availability and check for hardcoded version references.

The validation constraint update looks correct, but ensure that PostgreSQL/IvorySQL version 18 is officially released and that container images are available for this version. Additionally, verify there are no hardcoded version 17 references elsewhere in the codebase that could cause inconsistencies.

Please search the web to confirm version 18 availability:

Run the following script to check for hardcoded version references:

🏁 Script executed:

#!/bin/bash
# Description: Search for hardcoded references to version 17 that might need updating

echo "=== Searching for potential hardcoded version 17 references ==="
# Search for version 17 in Go files (excluding this file and test files initially)
rg -nP '\b(version|Version|IVORY|POSTGRES|PG).*17\b' --type=go -g '!*_test.go' -C2

echo -e "\n=== Checking environment variable patterns ==="
# Look for RELATED_IMAGE patterns with version 17
rg -nP 'RELATED_IMAGE.*17' --type=go -C2

echo -e "\n=== Checking for maximum/minimum version constraints ==="
# Find other validation Maximum annotations
rg -nP 'validation:(Maximum|Minimum)=17' --type=go -C2

Length of output: 169

🌐 Web query:

Is PostgreSQL 18 released and generally available?

💡 Result:

Yes. PostgreSQL 18 was released and made generally available on September 25, 2025. (postgresql.org)

Citations:

🌐 Web query:

Is IvorySQL 18 released and available?

💡 Result:

Short answer: No — there is no IvorySQL "18" release.

Details: IvorySQL's latest releases are in the 4.x series (most recently IvorySQL 4.4, released March 10, 2025). IvorySQL has not published a release numbered 18 or a release based on PostgreSQL 18. PostgreSQL 18 itself was released on September 25, 2025, but IvorySQL has not announced a PG‑18 based IvorySQL release as of the IvorySQL release notes. [1][2]

Sources:

  • IvorySQL 4.4 documentation / release notes (v4.4, Mar 10, 2025). [1]
  • PostgreSQL announcement noting PostgreSQL 18 release (Sept 25, 2025) / related IvorySQL posts. [2]

Revert PostgreSQL version 18 validation constraint—IvorySQL 18 is not released.

PostgreSQL 18 was released on September 25, 2025, but IvorySQL has not published a release numbered 18 or a release based on PostgreSQL 18. The latest IvorySQL release is version 4.4.

Updating the validation maximum to 18 allows users to attempt deploying a non-existent IvorySQL version, which will fail at runtime. This change must be reverted or held until IvorySQL 18 is officially released.

Additionally, verify that the same change was not made to pgupgrade_types.go (referenced in the AI summary).

🤖 Prompt for AI Agents 
In pkg/apis/ivory-operator.ivorysql.org/v1beta1/ivorycluster_types.go around
lines 126-128, revert the validation change that set PostgresVersion maximum to
18; change the kubebuilder validation back to the previous supported maximum
(e.g., Maximum=17) or remove the 18 constraint until IvorySQL 18 is officially
released, and ensure the operator-sdk/csv tags remain consistent; also search
for and revert the same change in pgupgrade_types.go if present so both CRDs
enforce the same supported maximum.


Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/ivory-operator.ivorysql.org/v1beta1/pgupgrade_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type IVYUpgradeSpec struct {
// The major version of IvorySQL before the upgrade.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=10
// +kubebuilder:validation:Maximum=17
// +kubebuilder:validation:Maximum=18
FromIvoryVersion int `json:"fromIvoryVersion"`

// TODO(benjaminjb): define webhook validation to make sure
Expand All @@ -70,7 +70,7 @@ type IVYUpgradeSpec struct {
// The major version of IvorySQL to be upgraded to.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=10
// +kubebuilder:validation:Maximum=17
// +kubebuilder:validation:Maximum=18
ToIvoryVersion int `json:"toIvoryVersion"`

// The image name to use for IvorySQL containers after upgrade.
Expand Down
4 changes: 2 additions & 2 deletions testing/kuttl/e2e-other/exporter-upgrade/00--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ kind: IvoryCluster
metadata:
name: exporter
spec:
postgresVersion: 16
image: docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
postgresVersion: 18
image: docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1
instances:
- name: instance1
dataVolumeClaimSpec:
Expand Down
4 changes: 2 additions & 2 deletions testing/kuttl/e2e-other/exporter-upgrade/02--update-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ kind: IvoryCluster
metadata:
name: exporter
spec:
postgresVersion: 16
image: docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
postgresVersion: 18
image: docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1
Loading