Fix apply without K0sBinaryPath always performing an upgrade (#195)

hrenard · kke · web-flow · commit 658cd398c053 · 2021-08-25T09:32:57.000+03:00
* fix always upgrade

* Update phase/gather_k0s_facts.go

Co-authored-by: Kimmo Lehto &lt;kimmo.lehto@gmail.com&gt;
diff --git a/phase/gather_k0s_facts.go b/phase/gather_k0s_facts.go
@@ -124,7 +124,7 @@ func (p *GatherK0sFacts) needsUpgrade(h *cluster.Host) bool {
 	// If supplimental files or a k0s binary have been specified explicitly,
 	// always upgrade.  This covers the scenario where a user moves from a
 	// default-install cluster to one fed by OCI image bundles (ie. airgap)
-	if len(h.Files) != 0 || len(h.K0sBinaryPath) == 0 {
+	if len(h.Files) > 0 || h.K0sBinaryPath != "" {
 		return true
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func (p GatherK0sFacts) needsUpgrade(h cluster.Host) bool {`
`124`	`124`	`// If supplimental files or a k0s binary have been specified explicitly,`
`125`	`125`	`// always upgrade. This covers the scenario where a user moves from a`
`126`	`126`	`// default-install cluster to one fed by OCI image bundles (ie. airgap)`
`127`		`- if len(h.Files) != 0 \|\| len(h.K0sBinaryPath) == 0 {`
	`127`	`+ if len(h.Files) > 0 \|\| h.K0sBinaryPath != "" {`
`128`	`128`	`return true`
`129`	`129`	`}`
`130`	`130`