From cb3c2580d3691550be99ea40d3753368c03001ff Mon Sep 17 00:00:00 2001 From: 24sama Date: Wed, 15 Jun 2022 16:31:34 +0800 Subject: [PATCH] fix: can't upgrade k8s version when ks version does not changed Signed-off-by: 24sama --- pkg/bootstrap/precheck/tasks.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/bootstrap/precheck/tasks.go b/pkg/bootstrap/precheck/tasks.go index ce7cc9e7..77440736 100644 --- a/pkg/bootstrap/precheck/tasks.go +++ b/pkg/bootstrap/precheck/tasks.go @@ -21,14 +21,15 @@ import ( "regexp" "strings" + "github.com/pkg/errors" + versionutil "k8s.io/apimachinery/pkg/util/version" + "github.com/kubesphere/kubekey/pkg/common" "github.com/kubesphere/kubekey/pkg/core/action" "github.com/kubesphere/kubekey/pkg/core/connector" "github.com/kubesphere/kubekey/pkg/core/logger" "github.com/kubesphere/kubekey/pkg/version/kubernetes" "github.com/kubesphere/kubekey/pkg/version/kubesphere" - "github.com/pkg/errors" - versionutil "k8s.io/apimachinery/pkg/util/version" ) type GreetingsTask struct { @@ -274,8 +275,10 @@ func (d *DependencyCheck) Execute(_ connector.Runtime) error { return errors.New(fmt.Sprintf("Unsupported version: %s", desiredVersion)) } - if ok := ksInstaller.UpgradeSupport(currentKsVersion); !ok { - return errors.New(fmt.Sprintf("Unsupported upgrade plan: %s to %s", currentKsVersion, desiredVersion)) + if currentKsVersion != desiredVersion { + if ok := ksInstaller.UpgradeSupport(currentKsVersion); !ok { + return errors.New(fmt.Sprintf("Unsupported upgrade plan: %s to %s", currentKsVersion, desiredVersion)) + } } if ok := ksInstaller.K8sSupport(d.KubeConf.Cluster.Kubernetes.Version); !ok { @@ -285,7 +288,7 @@ func (d *DependencyCheck) Execute(_ connector.Runtime) error { } else { ksInstaller, ok := kubesphere.VersionMap[currentKsVersion] if !ok { - return errors.New(fmt.Sprintf("Unsupported version: %s", desiredVersion)) + return errors.New(fmt.Sprintf("Unsupported version: %s", currentKsVersion)) } if ok := ksInstaller.K8sSupport(d.KubeConf.Cluster.Kubernetes.Version); !ok {