Fix: addon args is not changed when reinstall it without args (#6065)

* Fix: addon args is not changed when reinstall it without args

Signed-off-by: zhaohuihui <zhaohuihui_yewu@cmss.chinamobile.com>

* Fix: addon args review modify

Signed-off-by: zhaohuihui <zhaohuihui_yewu@cmss.chinamobile.com>

---------

Signed-off-by: zhaohuihui <zhaohuihui_yewu@cmss.chinamobile.com>
This commit is contained in:
zhaohuiweixiao
2023-06-14 16:59:35 +08:00
committed by GitHub
parent a513029ec8
commit 49327b8910

View File

@@ -846,6 +846,21 @@ func RenderArgsSecret(addon *InstallPackage, args map[string]interface{}) *unstr
return u
}
// deleteArgsSecret delete the addon's args secret file
func deleteArgsSecret(ctx context.Context, k8sClient client.Client, addonName string) error {
var sec v1.Secret
if err := k8sClient.Get(ctx, client.ObjectKey{Namespace: types.DefaultKubeVelaNS, Name: addonutil.Addon2SecName(addonName)}, &sec); err == nil {
// Handle successful get operation
if deleteErr := k8sClient.Delete(ctx, &sec); deleteErr != nil {
return deleteErr
}
return nil
} else if !apierrors.IsNotFound(err) {
return err
}
return nil
}
// FetchArgsFromSecret fetch addon args from secrets
func FetchArgsFromSecret(sec *v1.Secret) (map[string]interface{}, error) {
res := map[string]interface{}{}
@@ -1494,6 +1509,12 @@ func (h *Installer) dispatchAddonResource(addon *InstallPackage) error {
if err != nil {
return err
}
} else {
// delete addon args secret file
deleteErr := deleteArgsSecret(h.ctx, h.cli, addon.Name)
if deleteErr != nil {
return deleteErr
}
}
return nil
}