From 4ace8cdfa63281c72035f9083418724fa4d15916 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 13 Nov 2020 16:20:16 +0100 Subject: [PATCH] Skip deleting of objects that aren't found anymore Should not abort anymore when the candidate has been deleted in the meantime. Signed-off-by: Chris --- pkg/configmap/configmap.go | 3 ++- pkg/secret/secret.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/configmap/configmap.go b/pkg/configmap/configmap.go index 9f28c39..c486bb0 100644 --- a/pkg/configmap/configmap.go +++ b/pkg/configmap/configmap.go @@ -8,6 +8,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/thoas/go-funk" v1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" core "k8s.io/client-go/kubernetes/typed/core/v1" @@ -94,7 +95,7 @@ func (cms ConfigMapsService) GetUnused(namespace string, configMaps []v1.ConfigM func (cms ConfigMapsService) Delete(configMaps []v1.ConfigMap) error { for _, resource := range configMaps { err := cms.client.Delete(resource.Name, &metav1.DeleteOptions{}) - if err != nil { + if err != nil && !apierrors.IsNotFound(err) { return err } if cms.configuration.Batch { diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go index 2390beb..b41e061 100644 --- a/pkg/secret/secret.go +++ b/pkg/secret/secret.go @@ -8,6 +8,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/thoas/go-funk" v1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" core "k8s.io/client-go/kubernetes/typed/core/v1" @@ -95,7 +96,7 @@ func (ss SecretsService) GetUnused(namespace string, resources []v1.Secret) (unu func (ss SecretsService) Delete(secrets []v1.Secret) error { for _, resource := range secrets { err := ss.client.Delete(resource.Name, &metav1.DeleteOptions{}) - if err != nil { + if err != nil && !apierrors.IsNotFound(err) { return err } if ss.configuration.Batch {