Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow upgrade to the same Kubernetes version #315

Merged
merged 1 commit into from
Mar 29, 2019
Merged

Allow upgrade to the same Kubernetes version #315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkg/upgrader/upgrade/preflight_checks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"github.com/Masterminds/semver"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/kubermatic/kubeone/pkg/config"
"github.com/kubermatic/kubeone/pkg/ssh"
Expand Down Expand Up @@ -83,7 +84,7 @@ func runPreflightChecks(ctx *util.Context) error {
}

ctx.Logger.Infoln("Verifying is it possible to upgrade to the desired version…")
if err := verifyVersion(ctx.Cluster.Versions.Kubernetes, &nodes, ctx.Verbose); err != nil {
if err := verifyVersion(ctx.Logger, ctx.Cluster.Versions.Kubernetes, &nodes, ctx.Verbose, ctx.ForceUpgrade); err != nil {
return errors.Wrap(err, "unable to verify components version")
}

Expand Down Expand Up @@ -195,7 +196,7 @@ func verifyEndpoints(nodes *corev1.NodeList, hosts []*config.HostConfig, verbose
}

// verifyVersion verifies is it possible to upgrade to the requested version
func verifyVersion(version string, nodes *corev1.NodeList, verbose bool) error {
func verifyVersion(logger logrus.FieldLogger, version string, nodes *corev1.NodeList, verbose, force bool) error {
reqVer, err := semver.NewVersion(version)
if err != nil {
return errors.Wrap(err, "provided version is invalid")
Expand All @@ -211,8 +212,15 @@ func verifyVersion(version string, nodes *corev1.NodeList, verbose bool) error {
fmt.Printf("Requested version: %s", reqVer.String())
}

if reqVer.Compare(kubelet) <= 0 {
return errors.New("unable to upgrade to same or lower version")
if reqVer.Compare(kubelet) < 0 {
return errors.New("unable to upgrade to lower version")
}
if reqVer.Compare(kubelet) == 0 {
if force {
logger.Warningf("upgrading to the same kubernetes version")
return nil
}
return errors.New("unable to upgrade to the same version")
}

return nil
Expand Down