15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: can't upgrade k8s version when ks version does not changed 

Signed-off-by: 24sama <jacksama@foxmail.com>
This commit is contained in:
24sama 2022-06-15 16:31:34 +08:00
parent 7f1b36a044
commit cb3c2580d3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/bootstrap/precheck/tasks.go
View File

@ -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 {