From dc62323aa7f6782d69c7ac6509eb270e86ef31bd Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Tue, 28 Sep 2021 21:42:24 +0200 Subject: Fix for config resources delete with instance delete Issue-ID: MULTICLOUD-1332 Signed-off-by: Lukasz Rajewski Change-Id: I08a3d623d6f12777d88a168af0cb804c63104887 --- src/k8splugin/internal/app/instance.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/k8splugin/internal/app/instance.go') diff --git a/src/k8splugin/internal/app/instance.go b/src/k8splugin/internal/app/instance.go index ad36aaa5..0f1f3d7e 100644 --- a/src/k8splugin/internal/app/instance.go +++ b/src/k8splugin/internal/app/instance.go @@ -717,6 +717,13 @@ func (v *InstanceClient) Delete(id string) error { if err != nil { return pkgerrors.Wrap(err, "Getting CloudRegion Information") } + + configClient := NewConfigClient() + configs, err := configClient.List(id) + if err != nil { + return pkgerrors.Wrap(err, "Getting Configs Information") + } + inst.Status = "PRE-DELETE" inst.HookProgress = "" err = db.DBconn.Update(v.storeName, key, v.tagInst, inst) @@ -743,6 +750,18 @@ func (v *InstanceClient) Delete(id string) error { if err != nil { log.Printf("Update Instance DB Entry for release %s has error.", inst.ReleaseName) } + + if len(configs) > 0 { + log.Printf("Deleting config resources first") + for _, config := range configs { + log.Printf("Deleting Config %s Resources", config.ConfigName) + _, err = configClient.Delete(id, config.ConfigName) + if err != nil { + return pkgerrors.Wrap(err, "Deleting Config Resources") + } + } + } + err = k8sClient.deleteResources(inst.Resources, inst.Namespace) if err != nil { return pkgerrors.Wrap(err, "Deleting Instance Resources") -- cgit 1.2.3-korg