github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Kubernetes Submit Queue 2017-04-30 01:49:10 -07:00 committed by GitHub
parent 19d1d76b36 d1e018b06f
commit 9bce5f01c8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
federation/pkg/federation-controller/util/BUILD
View File

@ -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",

5
federation/pkg/federation-controller/util/federated_updater.go
View File

@ -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)