diff --git a/pkg/services/check/check.go b/pkg/services/check/check.go index f7df10f1375..87dcb70324e 100644 --- a/pkg/services/check/check.go +++ b/pkg/services/check/check.go @@ -8,7 +8,7 @@ import ( ) const ( - kubernetesConstraints = ">=1.20.6-0" + kubernetesConstraints = ">=1.26" ) // KubernetesVersion checks if the Kubernetes version of the client is recent enough and @@ -30,5 +30,5 @@ func KubernetesVersion(c discovery.DiscoveryInterface) (string, error) { return "", fmt.Errorf("✗ kubernetes version %s does not match %s", sv.Original(), kubernetesConstraints) } - return fmt.Sprintf("✔ Kubernetes %s %s", sv.String(), kubernetesConstraints), nil + return fmt.Sprintf("✔ Kubernetes %s %s", sv, kubernetesConstraints), nil } diff --git a/pkg/services/check/check_test.go b/pkg/services/check/check_test.go index d2ea0a0fa72..1f7c11375db 100644 --- a/pkg/services/check/check_test.go +++ b/pkg/services/check/check_test.go @@ -39,12 +39,12 @@ func TestKubernetesVersion(t *testing.T) { { name: "server version satisfies constraint", serverVersion: "v1.28.4", - expectedRes: `✔ Kubernetes 1.28.4 >=1.20.6-0`, + expectedRes: `^✔ Kubernetes 1.28.4 >=1.`, }, { name: "server version too low", serverVersion: "v1.20.5", - expectedErr: `✗ kubernetes version v1\.20\.5 does not match >=1\.20\.6-0`, + expectedErr: `✗ kubernetes version v1\.20\.5 does not match >=1\.`, }, { name: "server version not semver compliant", @@ -72,7 +72,7 @@ func TestKubernetesVersion(t *testing.T) { g.Expect(err).To(MatchError(MatchRegexp(tt.expectedErr))) } - g.Expect(res).To(Equal(tt.expectedRes)) + g.Expect(res).To(MatchRegexp(tt.expectedRes)) }) } }