Merge pull request #44483 from FengyunPan/ignore-notFound2

Automatic merge from submit-queue Ignore IsNotFound error IsNotFound error is fine since that means the object is deleted already, so we should check err and ignore err before returning.

Merge pull request #44483 from FengyunPan/ignore-notFound2
9bce5f01 · Kubernetes Submit Queue · GitHub · 19d1d76b · d1e018b0 · 9bce5f01
Commit 9bce5f01 authored Apr 30, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

BUILD federation/pkg/federation-controller/util/BUILD +1 -0

federated_updater.go ...ation/pkg/federation-controller/util/federated_updater.go +5 -0

No files found.
--- a/federation/pkg/federation-controller/util/BUILD
+++ b/federation/pkg/federation-controller/util/BUILD
@@ -33,6 +33,7 @@ go_library(
        "//pkg/client/clientset_generated/internalclientset:go_default_library",
        "//pkg/controller/deployment/util:go_default_library",
        "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",

--- a/federation/pkg/federation-controller/util/federated_updater.go
+++ b/federation/pkg/federation-controller/util/federated_updater.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"time"

+	"k8s.io/apimachinery/pkg/api/errors"
 	pkgruntime "k8s.io/apimachinery/pkg/runtime"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
@@ -95,6 +96,10 @@ func (fu *federatedUpdaterImpl) UpdateWithOnError(ops []FederatedOperation, time
 				err = fu.updateFunction(clientset, op.Obj)
 			case OperationTypeDelete:
 				err = fu.deleteFunction(clientset, op.Obj)
+				// IsNotFound error is fine since that means the object is deleted already.
+				if errors.IsNotFound(err) {
+					err = nil
+				}
 			}
 			if err != nil && onError != nil {
 				onError(op, err)