Merge branch 'master' into check-cluster-UID

pkg/cluster/majorversionupgrade.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/Masterminds/semver"
@@ -14,15 +15,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-// VersionMap Map of version numbers
-var VersionMap = map[string]int{
-	"14": 140000,
-	"15": 150000,
-	"16": 160000,
-	"17": 170000,
-	"18": 180000,
-}
-
 const (
 	majorVersionUpgradeSuccessAnnotation = "last-major-upgrade-success"
 	majorVersionUpgradeFailureAnnotation = "last-major-upgrade-failure"
@@ -30,14 +22,15 @@ const (
 
 // IsBiggerPostgresVersion Compare two Postgres version numbers
 func IsBiggerPostgresVersion(old string, new string) bool {
-	oldN := VersionMap[old]
-	newN := VersionMap[new]
+	oldN, _ := strconv.Atoi(old)
+	newN, _ := strconv.Atoi(new)
 	return newN > oldN
 }
 
 // GetDesiredMajorVersionAsInt Convert string to comparable integer of PG version
 func (c *Cluster) GetDesiredMajorVersionAsInt() int {
-	return VersionMap[c.GetDesiredMajorVersion()]
+	version, _ := strconv.Atoi(c.GetDesiredMajorVersion())
+	return version * 10000
 }
 
 // GetDesiredMajorVersion returns major version to use, incl. potential auto upgrade