Skip to content

K8SPG-995 update PG Operator versions for 3.0.0 release #531

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
valmiranogueira merged 8 commits into from
May 21, 2026
Merged

K8SPG-995 update PG Operator versions for 3.0.0 release #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3dbfc5a
Update PG Operator versions for 3.0.0 release
valmiranogueira May 13, 2026
c604b26
Add upgrade image
valmiranogueira May 13, 2026
26f0100
Add newer image versions for PG 3.0.0
valmiranogueira May 20, 2026
0f37c9f
Use official image for PG upgrade on 3.0.0
valmiranogueira May 21, 2026
71cb4ef
Set PMM3 as recommended for PG 3.0.0
valmiranogueira May 21, 2026
1b20474
Update hash of PG ARM images
valmiranogueira May 21, 2026
ff2932c
Merge branch 'main' into release-pg-3.0.0
valmiranogueira May 21, 2026
287113d
Set PMM3 as recommended
valmiranogueira May 21, 2026
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
30 changes: 28 additions & 2 deletions api-tests/apply_route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {

pgParams := &version_service.VersionServiceApplyParams{
Apply: "latest",
OperatorVersion: "2.9.0",
OperatorVersion: "3.0.0",
Product: "pg-operator",
}
pgParams.WithTimeout(2 * time.Second)
Expand All @@ -67,6 +67,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Pgbouncer, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Postgis, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Operator, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Pgupgrade, 1)

psParams := &version_service.VersionServiceApplyParams{
Apply: "latest",
Expand Down Expand Up @@ -135,7 +136,7 @@ func TestApplyPgShouldReturnSameMajorVersion(t *testing.T) {

pgParams := &version_service.VersionServiceApplyParams{
Apply: "latest",
OperatorVersion: "2.9.0",
OperatorVersion: "3.0.0",
Product: "pg-operator",
}
pgParams.WithTimeout(2 * time.Second)
Expand Down Expand Up @@ -923,6 +924,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
version string
}{
// test latest
{"latest", "3.0.0", "", "18.4"},
{"latest", "3.0.0", "17.10", "17.10"},
{"latest", "3.0.0", "16.14", "16.14"},
{"latest", "3.0.0", "15.18", "15.18"},
{"latest", "3.0.0", "14.23", "14.23"},
{"latest", "2.9.0", "", "18.3"},
{"latest", "2.9.0", "17.9", "17.9"},
{"latest", "2.9.0", "16.13", "16.13"},
Expand Down Expand Up @@ -991,6 +997,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"latest", "2.2.0", "12.14", "12.14"},

// test recommended
{"recommended", "3.0.0", "", "18.4"},
{"recommended", "3.0.0", "17.10", "17.10"},
{"recommended", "3.0.0", "16.14", "16.14"},
{"recommended", "3.0.0", "15.18", "15.18"},
{"recommended", "3.0.0", "14.23", "14.23"},
{"recommended", "2.9.0", "", "18.3"},
{"recommended", "2.9.0", "17.9", "17.9"},
{"recommended", "2.9.0", "16.13", "16.13"},
Expand Down Expand Up @@ -1056,6 +1067,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"recommended", "2.2.0", "12.14", "12.14"},

// test exact
{"18.4", "3.0.0", "", "18.4"},
{"17.10", "3.0.0", "", "17.10"},
{"16.14", "3.0.0", "", "16.14"},
{"15.18", "3.0.0", "", "15.18"},
{"14.23", "3.0.0", "", "14.23"},
{"18.3", "2.9.0", "", "18.3"},
{"17.9", "2.9.0", "", "17.9"},
{"16.13", "2.9.0", "", "16.13"},
Expand Down Expand Up @@ -1142,6 +1158,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"14.11", "1.6.0", "", "14.11"},

//test with suffix
{"14-latest", "3.0.0", "", "14.23"},
{"15-latest", "3.0.0", "", "15.18"},
{"16-latest", "3.0.0", "", "16.14"},
{"17-latest", "3.0.0", "", "17.10"},
{"18-latest", "3.0.0", "", "18.4"},
{"14-latest", "2.9.0", "", "14.22"},
{"15-latest", "2.9.0", "", "15.17"},
{"16-latest", "2.9.0", "", "16.13"},
Expand Down Expand Up @@ -1228,6 +1249,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"14-latest", "1.6.0", "", "14.11"},

// test with distribution suffix
{"latest", "3.0.0", "14.23 - Percona Distribution", "14.23"},
{"latest", "3.0.0", "15.18 - Percona Distribution", "15.18"},
{"latest", "3.0.0", "16.14 - Percona Distribution", "16.14"},
{"latest", "3.0.0", "17.10 - Percona Distribution", "17.10"},
{"latest", "3.0.0", "18.4 - Percona Distribution", "18.4"},
{"latest", "2.9.0", "14.22 - Percona Distribution", "14.22"},
{"latest", "2.9.0", "15.17 - Percona Distribution", "15.17"},
{"latest", "2.9.0", "16.13 - Percona Distribution", "16.13"},
Expand Down
28 changes: 28 additions & 0 deletions api-tests/operator_route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ func TestOperatorRouteShouldReturnRightOperatorVersion(t *testing.T) {
{"pg-operator", "2.8.1"},
{"pg-operator", "2.8.2"},
{"pg-operator", "2.9.0"},
{"pg-operator", "3.0.0"},
{"ps-operator", "0.5.0"},
{"ps-operator", "0.6.0"},
{"ps-operator", "0.7.0"},
Expand Down Expand Up @@ -267,6 +268,7 @@ func TestOperatorRoutePgShouldReturnNotEmptyResponses(t *testing.T) {
{"pg-operator", "2.8.1"},
{"pg-operator", "2.8.2"},
{"pg-operator", "2.9.0"},
{"pg-operator", "3.0.0"},
}

for _, c := range cases_v2 {
Expand All @@ -286,6 +288,32 @@ func TestOperatorRoutePgShouldReturnNotEmptyResponses(t *testing.T) {
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Pgbackrest), 0)
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Pgbouncer), 0)
}

cases_v3 := []struct {
product string
version string
}{
{"pg-operator", "3.0.0"},
}

for _, c := range cases_v3 {
params := &version_service.VersionServiceOperatorParams{
OperatorVersion: c.version,
Product: c.product,
}
params.WithTimeout(2 * time.Second)

resp, err := cli.VersionService.VersionServiceOperator(params)
assert.NoError(t, err)

assert.Len(t, resp.Payload.Versions, 1)
assert.Len(t, resp.Payload.Versions[0].Matrix.Operator, 1)
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Postgresql), 0)
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Pmm), 0)
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Pgbackrest), 0)
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Pgbouncer), 0)
assert.Greater(t, len(resp.Payload.Versions[0].Matrix.Pgupgrade), 0)
}
}

func TestOperatorRoutePsShouldReturnNotEmptyResponses(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions api/version.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ message VersionMatrix {
map<string, Version> toolkit = 26;
map<string, Version> postgis = 27;
map<string, Version> binlog_server = 28;
map<string, Version> pgupgrade = 29;
}

// OperatorVersion represents operator version.
Expand Down
4 changes: 4 additions & 0 deletions api/version.swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,10 @@ definitions:
type: object
additionalProperties:
$ref: '#/definitions/versionVersion'
pgupgrade:
type: object
additionalProperties:
$ref: '#/definitions/versionVersion'
pxcOperator:
type: object
additionalProperties:
Expand Down
1 change: 1 addition & 0 deletions server/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type Deps struct {
PgBackrestRepo map[string]interface{} `json:"pgbackrest_repo,omitempty"`
Pgbadger map[string]interface{} `json:"pgbadger,omitempty"`
Pgbouncer map[string]interface{} `json:"pgbouncer,omitempty"`
PgUpgrade map[string]interface{} `json:"pgupgrade,omitempty"`
Postgis map[string]interface{} `json:"postgis,omitempty"`
Orchestrator map[string]interface{} `json:"orchestrator,omitempty"`
Router map[string]interface{} `json:"router,omitempty"`
Expand Down
9 changes: 9 additions & 0 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,15 @@ func pg(vs *pbVersion.VersionResponse, deps Deps, req *pbVersion.ApplyRequest) e
return err
}

depVer, err = pgDepFilter(deps.PgUpgrade, productVersion)
if err != nil {
return err
}
err = defaultFilter(vs.Versions[0].Matrix.Pgupgrade, depVer, true)
if err != nil {
return err
}

depVer, err = pgDepFilter(deps.Postgis, productVersion)
if err != nil {
return err
Expand Down
Loading
Loading