From a15e721f338761ac2817763dc97ce221a0a57d79 Mon Sep 17 00:00:00 2001 From: atighineanu Date: Sat, 21 Mar 2020 16:54:56 +0000 Subject: [PATCH] fixed output to be triggered also by different addon.Version --- internal/pkg/skuba/upgrade/addon/versions.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/pkg/skuba/upgrade/addon/versions.go b/internal/pkg/skuba/upgrade/addon/versions.go index 521ae21117..e59d90bdd6 100644 --- a/internal/pkg/skuba/upgrade/addon/versions.go +++ b/internal/pkg/skuba/upgrade/addon/versions.go @@ -50,7 +50,7 @@ func UpdatedAddonsForAddonsVersion(clusterVersion *version.Version, addonsVersio for addonName, addonLatestVersion := range latestAddonVersions { addonCurrentVersion := addonsVersion[addonName] aviu.Current[addonName] = addonCurrentVersion - if addonCurrentVersion == nil || (addonLatestVersion.ManifestVersion > addonCurrentVersion.ManifestVersion) { + if addonCurrentVersion == nil || (addonLatestVersion.ManifestVersion > addonCurrentVersion.ManifestVersion) || (addonCurrentVersion.Version != addonLatestVersion.Version) { aviu.Updated[addonName] = addonLatestVersion } } @@ -89,6 +89,9 @@ func PrintAddonUpdates(updatedAddons AddonVersionInfoUpdate) { if hasAddonVersionBump(updatedAddons, addon) { fmt.Printf(" - %s: %s -> %s\n", addon, updatedAddons.Current[addon].Version, updatedAddons.Updated[addon].Version) + if updatedAddons.Current[addon].ManifestVersion != updatedAddons.Updated[addon].ManifestVersion { + fmt.Printf(" (manifest version from %d to %d)\n", updatedAddons.Current[addon].ManifestVersion, updatedAddons.Updated[addon].ManifestVersion) + } } else { if len(updatedAddons.Current[addon].Version) > 0 { fmt.Printf(" - %s: %s (manifest version from %d to %d)\n", addon,