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 <[email protected]>
appuio · Nov 13, 2020 · b28eed9 · b28eed9
1 parent 2d9872a
commit b28eed9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 {