Merge pull request #4229 from twz123/kube-pre-release-constant

Have a constant to indicate Kubernetes pre-releases
k0sproject · Apr 11, 2024 · 6fd781e · 6fd781e
2 parents 750e9df + 0422dcb
commit 6fd781e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/inttest/kubectl/kubectl_test.go b/inttest/kubectl/kubectl_test.go
@@ -211,8 +211,12 @@ func checkClientVersion(t *testing.T, v map[string]any) {
 }
 
 func checkServerVersion(t *testing.T, v map[string]any) {
+	expectedVersion := constant.KubernetesMajorMinorVersion
+	if constant.KubernetesPreRelease {
+		expectedVersion += "+"
+	}
 	assert.Equal(t,
-		constant.KubernetesMajorMinorVersion,
+		expectedVersion,
 		fmt.Sprintf("%v.%v", requiredValue[string](t, v, "major"), requiredValue[string](t, v, "minor")),
 	)
 	assert.Contains(t,

diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go
@@ -72,6 +72,8 @@ const (
 
 	// KubernetesMajorMinorVersion defines the current embedded major.minor version info
 	KubernetesMajorMinorVersion = "1.29"
+	// Indicates if k0s is using a Kubernetes pre-release or a GA version.
+	KubernetesPreRelease = false
 
 	/* Image Constants */