FIXUP: add a helper for kube version tests

Author: sfc-gh-cbandy

internal/testing/require/kubernetes.go

@@ -15,6 +15,8 @@ import (
 	"golang.org/x/tools/go/packages"
 	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/version"
+	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -73,6 +75,34 @@ func Kubernetes(t TestingT) client.Client {
 	return cc
 }
 
+// KubernetesAtLeast is the same as [Kubernetes] but also calls t.Skip when
+// the connected Kubernetes API is earlier than minVersion, like "1.28" or "1.27.7".
+func KubernetesAtLeast(t TestingT, minVersion string) client.Client {
+	t.Helper()
+
+	expectedVersion, err := version.ParseGeneric(minVersion)
+	assert.NilError(t, err)
+
+	// Start or connect to Kubernetes
+	env, cc := kubernetes3(t)
+
+	dc, err := discovery.NewDiscoveryClientForConfig(env.Config)
+	assert.NilError(t, err)
+
+	serverInfo, err := dc.ServerVersion()
+	assert.NilError(t, err)
+
+	serverVersion, err := version.ParseGeneric(serverInfo.GitVersion)
+	assert.NilError(t, err)
+
+	if serverVersion.LessThan(expectedVersion) {
+		t.Log("Kubernetes version", serverVersion, "is before", expectedVersion)
+		t.SkipNow()
+	}
+
+	return cc
+}
+
 // Kubernetes2 is the same as [Kubernetes] but also returns a copy of the client
 // configuration.
 func Kubernetes2(t TestingT) (*rest.Config, client.Client) {

internal/testing/validation/postgrescluster_test.go

@@ -592,6 +592,9 @@ func TestPostgresUserInterfaceAcrossVersions(t *testing.T) {
 	})
 
 	t.Run("v1 is valid with pgadmin but only if unchanged from v1beta1", func(t *testing.T) {
+		// Validation ratcheting is enabled starting in Kubernetes 1.30
+		require.KubernetesAtLeast(t, "1.30")
+
 		// A v1 that has been updated from a v1beta1 with no change to the userInterface is valid
 		assert.NilError(t, cc.Create(ctx, base),
 			"expected this base cluster to be valid")

pkg/apis/postgres-operator.crunchydata.com/v1/config_types_test.go

@@ -8,9 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	v1 "github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1"
 	"gotest.tools/v3/assert"
 	"sigs.k8s.io/yaml"
+
+	v1 "github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1"
 )
 
 func TestOptionalConfigMapKeyRefAsProjection(t *testing.T) {