kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in MergeAddons 

* Replace existing addon if v (new) replaces() existing, instead
  of the other way around.
This commit is contained in:
Nick Turner 2020-10-13 10:55:31 -07:00
parent f8d00cc535
commit 61ac9a5b07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/pkg/channels/addon.go
View File

@ -59,7 +59,7 @@ func (m *AddonMenu) MergeAddons(o *AddonMenu) {
if existing == nil { if existing == nil {
m.Addons[k] = v m.Addons[k] = v
} else { } else {
if existing.ChannelVersion().replaces(v.ChannelVersion()) { if v.ChannelVersion().replaces(existing.ChannelVersion()) {
m.Addons[k] = v m.Addons[k] = v
} }
} }