fix(upgrade): always check for upgrade when enabled via configuration

relates to #6775

Author: JanDeDobbeleer

src/cli/upgrade.go

@@ -63,6 +63,11 @@ var upgradeCmd = &cobra.Command{
 
 		cache.Init(sh, cache.Persist)
 
+		if _, OK := cache.Get[string](cache.Device, upgrade.CACHEKEY); OK {
+			log.Debug("upgrade check already performed recently, skipping")
+			return
+		}
+
 		terminal.Init(sh)
 		fmt.Print(terminal.StartProgress())
 
@@ -72,7 +77,7 @@ var upgradeCmd = &cobra.Command{
 			fmt.Print(terminal.StopProgress())
 
 			// always reset the cache key so we respect the interval no matter what the outcome
-			cache.Set(cache.Device, upgrade.CACHEKEY, "", cfg.Upgrade.Interval)
+			cache.Set(cache.Device, upgrade.CACHEKEY, "true", cfg.Upgrade.Interval)
 
 			cache.Close()
 

src/config/config.go

@@ -198,11 +198,6 @@ func (cfg *Config) Features(env runtime.Environment) shell.Features {
 func (cfg *Config) upgradeFeatures() shell.Features {
 	var feats shell.Features
 
-	if _, OK := cache.Get[string](cache.Device, upgrade.CACHEKEY); OK && !cfg.Upgrade.Force {
-		log.Debug("upgrade cache key found and not forced, skipping upgrade")
-		return feats
-	}
-
 	autoUpgrade := cfg.Upgrade.Auto
 	if val, OK := cache.Get[bool](cache.Device, AUTOUPGRADE); OK {
 		log.Debug("auto upgrade key found, overriding config")