Handle errors properly; cleanup un-used code

Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
k0sproject · Feb 19, 2021 · 23f6e9f · 23f6e9f
1 parent 12e0831
commit 23f6e9f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/phase/gather_k0s_facts.go b/phase/gather_k0s_facts.go
@@ -113,6 +113,10 @@ func (p *GatherK0sFacts) investigateK0s(h *cluster.Host) error {
 
 func (p *GatherK0sFacts) needsUpgrade(h *cluster.Host) bool {
 	c, err := semver.NewConstraint(fmt.Sprintf("< %s", p.Config.Spec.K0s.Version))
+	if err != nil {
+		log.Warnf("%s: failed to parse version contraint: %s", h, err.Error())
+		return false
+	}
 	current, err := semver.NewVersion(h.Metadata.K0sRunningVersion)
 	if err != nil {
 		log.Warnf("%s: failed to parse version info: %s", h, err.Error())

diff --git a/phase/upgrade_controllers.go b/phase/upgrade_controllers.go
@@ -49,7 +49,9 @@ func (p *UpgradeControllers) Run() error {
 				return err
 			}
 		} else {
-			h.Configurer.StopService(h, h.K0sServiceName())
+			if err := h.Configurer.StopService(h, h.K0sServiceName()); err != nil {
+				return err
+			}
 		}
 		if err := h.UpdateK0sBinary(p.Config.Spec.K0s.Version); err != nil {
 			return err
@@ -66,21 +68,9 @@ func (p *UpgradeControllers) Run() error {
 	return nil
 }
 
-func (p *UpgradeControllers) needsUpgrade(h *cluster.Host) bool {
-	log.Debugf("%s: checking need for upgrade")
-	c, err := semver.NewConstraint(fmt.Sprintf("< %s", p.Config.Spec.K0s.Version))
-	current, err := semver.NewVersion(h.Metadata.K0sRunningVersion)
-	if err != nil {
-		log.Warnf("%s: failed to parse version info: %s", h, err.Error())
-		return false
-	}
-
-	return c.Check(current)
-}
-
 func (p *UpgradeControllers) needsMigration(h *cluster.Host) bool {
 	log.Debugf("%s: checking need for 0.10 --> 0.11 migration", h)
-	c, err := semver.NewConstraint("< 0.11")
+	c, _ := semver.NewConstraint("< 0.11")
 	current, err := semver.NewVersion(h.Metadata.K0sRunningVersion)
 	if err != nil {
 		log.Warnf("%s: failed to parse version info: %s", h, err.Error())
@@ -93,7 +83,9 @@ func (p *UpgradeControllers) needsMigration(h *cluster.Host) bool {
 func (p *UpgradeControllers) migrateService(h *cluster.Host) error {
 
 	log.Infof("%s: Running with legacy service name, migrating...", h)
-	h.Configurer.StopService(h, "k0sserver")
+	if err := h.Configurer.StopService(h, "k0sserver"); err != nil {
+		return err
+	}
 	sp, err := h.Configurer.ServiceScriptPath(h, "k0sserver")
 	if err != nil {
 		return err