From 416c6e79542d6eb8170b63019db9239561d4054d Mon Sep 17 00:00:00 2001 From: inovindasari Date: Mon, 16 Dec 2024 10:16:38 +0100 Subject: [PATCH 1/2] Integrate spilo with Patroni 4 --- pkg/cluster/majorversionupgrade.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index ad431acc4..5d9913ae2 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -16,11 +16,11 @@ import ( // VersionMap Map of version numbers var VersionMap = map[string]int{ - "12": 120000, "13": 130000, "14": 140000, "15": 150000, "16": 160000, + "17": 170000, } const ( @@ -44,7 +44,7 @@ func (c *Cluster) GetDesiredMajorVersionAsInt() int { func (c *Cluster) GetDesiredMajorVersion() string { if c.Config.OpConfig.MajorVersionUpgradeMode == "full" { - // e.g. current is 12, minimal is 12 allowing 12 to 16 clusters, everything below is upgraded + // e.g. current is 13, minimal is 13 allowing 13 to 17 clusters, everything below is upgraded if IsBiggerPostgresVersion(c.Spec.PgVersion, c.Config.OpConfig.MinimalMajorVersion) { c.logger.Infof("overwriting configured major version %s to %s", c.Spec.PgVersion, c.Config.OpConfig.TargetMajorVersion) return c.Config.OpConfig.TargetMajorVersion @@ -155,7 +155,7 @@ func (c *Cluster) majorVersionUpgrade() error { c.logger.Infof("identified non running pod, potentially skipping major version upgrade") } - if ps.Role == "master" { + if ps.Role == "master" || ps.Role == "primary" { masterPod = &pods[i] c.currentMajorVersion = ps.ServerVersion } From 860b3eb43b5bb34ddc31d090205c23428d2b2091 Mon Sep 17 00:00:00 2001 From: inovindasari Date: Mon, 16 Dec 2024 10:23:41 +0100 Subject: [PATCH 2/2] remove unnecessary changes --- pkg/cluster/majorversionupgrade.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index 5d9913ae2..560f8977f 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -16,11 +16,11 @@ import ( // VersionMap Map of version numbers var VersionMap = map[string]int{ + "12": 120000, "13": 130000, "14": 140000, "15": 150000, "16": 160000, - "17": 170000, } const ( @@ -44,7 +44,7 @@ func (c *Cluster) GetDesiredMajorVersionAsInt() int { func (c *Cluster) GetDesiredMajorVersion() string { if c.Config.OpConfig.MajorVersionUpgradeMode == "full" { - // e.g. current is 13, minimal is 13 allowing 13 to 17 clusters, everything below is upgraded + // e.g. current is 12, minimal is 12 allowing 12 to 16 clusters, everything below is upgraded if IsBiggerPostgresVersion(c.Spec.PgVersion, c.Config.OpConfig.MinimalMajorVersion) { c.logger.Infof("overwriting configured major version %s to %s", c.Spec.PgVersion, c.Config.OpConfig.TargetMajorVersion) return c.Config.OpConfig.TargetMajorVersion