minnor version check

Author: limak9182

pkg/postgresql/cluster/adapter/webhook/postgrescluster_validation.go

@@ -108,13 +108,17 @@ func validateAgainstClass(obj *enterpriseApi.PostgresCluster, reader client.Read
 	}
 
 	if obj.Spec.PostgresVersion != nil && classConfig.PostgresVersion != nil {
-		clusterMajor := parseMajorVersion(*obj.Spec.PostgresVersion)
-		classMajor := parseMajorVersion(*classConfig.PostgresVersion)
-		if clusterMajor > 0 && classMajor > 0 && clusterMajor < classMajor {
-			allErrs = append(allErrs, field.Invalid(
-				field.NewPath("spec").Child("postgresVersion"),
-				*obj.Spec.PostgresVersion,
-				"postgresVersion cannot be lower than class default ("+*classConfig.PostgresVersion+")"))
+		clusterMajor, clusterMinor := parseVersion(*obj.Spec.PostgresVersion)
+		classMajor, classMinor := parseVersion(*classConfig.PostgresVersion)
+		if clusterMajor > 0 && classMajor > 0 {
+			versionTooLow := clusterMajor < classMajor ||
+				(clusterMajor == classMajor && classMinor >= 0 && clusterMinor >= 0 && clusterMinor < classMinor)
+			if versionTooLow {
+				allErrs = append(allErrs, field.Invalid(
+					field.NewPath("spec").Child("postgresVersion"),
+					*obj.Spec.PostgresVersion,
+					"postgresVersion cannot be lower than class default ("+*classConfig.PostgresVersion+")"))
+			}
 		}
 	}
 
@@ -131,15 +135,16 @@ func validateAgainstClass(obj *enterpriseApi.PostgresCluster, reader client.Read
 	return allErrs
 }
 
-func parseMajorVersion(version string) int {
+func parseVersion(version string) (major, minor int) {
 	for i, ch := range version {
 		if ch == '.' {
-			v, _ := strconv.Atoi(version[:i])
-			return v
+			major, _ = strconv.Atoi(version[:i])
+			minor, _ = strconv.Atoi(version[i+1:])
+			return major, minor
 		}
 	}
-	v, _ := strconv.Atoi(version)
-	return v
+	major, _ = strconv.Atoi(version)
+	return major, -1
 }
 
 // GetPostgresClusterWarningsOnCreate returns warnings for PostgresCluster CREATE.

pkg/postgresql/cluster/adapter/webhook/postgrescluster_validation_test.go

@@ -230,6 +230,18 @@ func TestValidateAgainstClass(t *testing.T) {
 		},
 	}
 
+	classWithMinorVersion := &enterpriseApi.PostgresClusterClass{
+		ObjectMeta: metav1.ObjectMeta{Name: "prod-pinned"},
+		Spec: enterpriseApi.PostgresClusterClassSpec{
+			Provisioner: "postgresql.cnpg.io",
+			Config: &enterpriseApi.PostgresClusterClassConfig{
+				Instances:       ptrInt32(3),
+				Storage:         ptrQuantity("50Gi"),
+				PostgresVersion: ptrString("17.2"),
+			},
+		},
+	}
+
 	classWithPoolerEnabled := &enterpriseApi.PostgresClusterClass{
 		ObjectMeta: metav1.ObjectMeta{Name: "pooler-class"},
 		Spec: enterpriseApi.PostgresClusterClassSpec{
@@ -336,16 +348,84 @@ func TestValidateAgainstClass(t *testing.T) {
 			wantErrField: "spec.postgresVersion",
 		},
 		{
-			name:  "valid - minor version higher",
+			name:  "valid - minor version ignored when class has major only",
+			class: classWithDefaults,
+			obj: &enterpriseApi.PostgresCluster{
+				Spec: enterpriseApi.PostgresClusterSpec{
+					Class:           "prod",
+					PostgresVersion: ptrString("17.2"),
+				},
+			},
+			wantErrCount: 0,
+		},
+		{
+			name:  "valid - lower minor ignored when class has major only",
 			class: classWithDefaults,
 			obj: &enterpriseApi.PostgresCluster{
 				Spec: enterpriseApi.PostgresClusterSpec{
 					Class:           "prod",
+					PostgresVersion: ptrString("17.0"),
+				},
+			},
+			wantErrCount: 0,
+		},
+		{
+			name:  "valid - cluster minor equal to class minor",
+			class: classWithMinorVersion,
+			obj: &enterpriseApi.PostgresCluster{
+				Spec: enterpriseApi.PostgresClusterSpec{
+					Class:           "prod-pinned",
 					PostgresVersion: ptrString("17.2"),
 				},
 			},
 			wantErrCount: 0,
 		},
+		{
+			name:  "valid - cluster minor higher than class minor",
+			class: classWithMinorVersion,
+			obj: &enterpriseApi.PostgresCluster{
+				Spec: enterpriseApi.PostgresClusterSpec{
+					Class:           "prod-pinned",
+					PostgresVersion: ptrString("17.5"),
+				},
+			},
+			wantErrCount: 0,
+		},
+		{
+			name:  "invalid - cluster minor lower than class minor",
+			class: classWithMinorVersion,
+			obj: &enterpriseApi.PostgresCluster{
+				Spec: enterpriseApi.PostgresClusterSpec{
+					Class:           "prod-pinned",
+					PostgresVersion: ptrString("17.1"),
+				},
+			},
+			wantErrCount: 1,
+			wantErrField: "spec.postgresVersion",
+		},
+		{
+			name:  "invalid - cluster major lower even with higher minor",
+			class: classWithMinorVersion,
+			obj: &enterpriseApi.PostgresCluster{
+				Spec: enterpriseApi.PostgresClusterSpec{
+					Class:           "prod-pinned",
+					PostgresVersion: ptrString("16.9"),
+				},
+			},
+			wantErrCount: 1,
+			wantErrField: "spec.postgresVersion",
+		},
+		{
+			name:  "valid - cluster major higher than class with minor",
+			class: classWithMinorVersion,
+			obj: &enterpriseApi.PostgresCluster{
+				Spec: enterpriseApi.PostgresClusterSpec{
+					Class:           "prod-pinned",
+					PostgresVersion: ptrString("18"),
+				},
+			},
+			wantErrCount: 0,
+		},
 		{
 			name:  "invalid - connection pooler enabled when class disables",
 			class: classWithDefaults,