From 258e59bf8563021f4eded42b33c6cc61a6ffebd8 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Tue, 5 Oct 2021 14:36:01 +0200 Subject: Fixed issue with order of deleted resources For delete operation order of resources is reverse to the order used for creation Issue-ID: MULTICLOUD-1398 Signed-off-by: Lukasz Rajewski Change-Id: I3f34c6000222e82c34f59042e99d2c37a343dfa5 --- src/k8splugin/internal/app/client.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/k8splugin/internal/app/client.go') diff --git a/src/k8splugin/internal/app/client.go b/src/k8splugin/internal/app/client.go index 06c4c464..f70dc0a5 100644 --- a/src/k8splugin/internal/app/client.go +++ b/src/k8splugin/internal/app/client.go @@ -550,18 +550,17 @@ func (k *KubernetesClient) DeleteKind(resource helm.KubernetesResource, namespac return pkgerrors.Wrap(err, "Error loading plugin") } - name, err := pluginImpl.Get(resource, namespace, k) + err = pluginImpl.Delete(resource, namespace, k) - if (err == nil && name == resource.Name) || (err != nil && strings.Contains(err.Error(), "not found") == false) { - err = pluginImpl.Delete(resource, namespace, k) - if err != nil { + if err != nil { + if strings.Contains(err.Error(), "not found") == false { return pkgerrors.Wrap(err, "Error deleting "+resource.Name) + } else { + log.Warn("Resource already does not exist", log.Fields{ + "gvk": resource.GVK, + "resource": resource.Name, + }) } - } else { - log.Warn("Resource does not exist, Skipping delete", log.Fields{ - "gvk": resource.GVK, - "resource": resource.Name, - }) } return nil -- cgit 1.2.3-korg