github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26504 from nowprovision/patch-1

Browse Source 
Automatic merge from submit-queue

Fix error handling in endpoint controller
This commit is contained in:
k8s-merge-robot 2016-06-25 07:43:49 -07:00 committed by GitHub
commit 464eff2bf2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/endpoint/endpoints_controller.go
View File

@ -273,6 +273,7 @@ func (e *EndpointController) deletePod(obj interface{}) {
podKey, err := keyFunc(obj) podKey, err := keyFunc(obj)
if err != nil { if err != nil {
glog.Errorf("Couldn't get key for object %+v: %v", obj, err) glog.Errorf("Couldn't get key for object %+v: %v", obj, err)
return
} }
glog.Infof("Pod %q was deleted but we don't have a record of its final state, so it will take up to %v before it will be removed from all endpoint records.", podKey, FullServiceResyncPeriod) glog.Infof("Pod %q was deleted but we don't have a record of its final state, so it will take up to %v before it will be removed from all endpoint records.", podKey, FullServiceResyncPeriod)
@ -284,6 +285,7 @@ func (e *EndpointController) enqueueService(obj interface{}) {
key, err := keyFunc(obj) key, err := keyFunc(obj)
if err != nil { if err != nil {
glog.Errorf("Couldn't get key for object %+v: %v", obj, err) glog.Errorf("Couldn't get key for object %+v: %v", obj, err)
return
} }
e.queue.Add(key) e.queue.Add(key)