Fix: addon status list addon info error when there are mulitiple registries (#6073)

Signed-off-by: zhaohuihui <zhaohuihui_yewu@cmss.chinamobile.com>
This commit is contained in:
zhaohuiweixiao
2023-06-13 10:34:52 +08:00
committed by GitHub
parent b576bee882
commit 95fa62164a
2 changed files with 9 additions and 0 deletions

View File

@@ -322,6 +322,7 @@ func (r *Registry) GetUIData(meta *SourceMeta, opt ListOptions) (*UIData, error)
if len(addon.GlobalParameters) != 0 {
addon.Parameters = addon.GlobalParameters
}
addon.RegistryName = r.Name
return addon, nil
}

View File

@@ -702,6 +702,14 @@ func generateAddonInfo(c client.Client, name string) (string, pkgaddon.Status, e
}
if len(addonPackages) != 0 {
addonPackage = addonPackages[0]
if status.InstalledRegistry != "" {
for _, ap := range addonPackages {
if ap.RegistryName == status.InstalledRegistry {
addonPackage = ap
break
}
}
}
}
}