Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

fixed output to be triggered also by different addon.Version bsc#1167320 #1018

Closed
wants to merge 2 commits into from
Closed

fixed output to be triggered also by different addon.Version bsc#1167320 #1018

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a15e721
fixed output to be triggered also by different addon.Version
Mar 21, 2020
1f4315c
Merge remote-tracking branch 'upstream/master'
Sep 10, 2020
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
5 changes: 4 additions & 1 deletion internal/pkg/skuba/upgrade/addon/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down Expand Up @@ -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,
Expand Down