fix: KubeSphere version check error

Signed-off-by: pixiake <guofeng@yunify.com>
kubesphere · Jul 26, 2023 · c849e91 · c849e91
1 parent 3e84255
commit c849e91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cmd/kk/pkg/bootstrap/precheck/tasks.go b/cmd/kk/pkg/bootstrap/precheck/tasks.go
@@ -241,9 +241,11 @@ func (k *KsVersionCheck) Execute(runtime connector.Runtime) error {
 	ccKsVersionStr, ccErr := runtime.GetRunner().SudoCmd(
 		"/usr/local/bin/kubectl get ClusterConfiguration ks-installer -n  kubesphere-system  -o jsonpath='{.metadata.labels.version}'",
 		false)
-	if ccErr == nil && ksVersionStr == "v3.1.0" {
+
+	if ccErr == nil && versionutil.MustParseSemantic(ccKsVersionStr).AtLeast(versionutil.MustParseSemantic("v3.1.0")) {
 		ksVersionStr = ccKsVersionStr
 	}
+
 	k.PipelineCache.Set(common.KubeSphereVersion, ksVersionStr)
 	return nil
 }

diff --git a/cmd/kk/pkg/version/kubernetes/version_enum.go b/cmd/kk/pkg/version/kubernetes/version_enum.go
@@ -35,6 +35,7 @@ const (
 	V123
 	V124
 	V125
+	V126
 )
 
 var VersionList = []Version{
@@ -45,6 +46,7 @@ var VersionList = []Version{
 	V123,
 	V124,
 	V125,
+	V126,
 }
 
 func (v Version) String() string {
@@ -63,6 +65,8 @@ func (v Version) String() string {
 		return "v1.24"
 	case V125:
 		return "v1.25"
+	case V126:
+		return "v1.26"
 	default:
 		return "invalid option"
 	}