Merge pull request #34694 from gmarek/deleted_final_state_unknown

Automatic merge from submit-queue Handle DeletedFinalStateUnknown in NodeController Fix #34692 ```release-note Fix panic in NodeController caused by receiving DeletedFinalStateUnknown object from the cache. ``` cc @davidopp

Merge pull request #34694 from gmarek/deleted_final_state_unknown
1c65d1df · Kubernetes Submit Queue · GitHub · aa485ce8 · 8b7e9d30 · 1c65d1df
Commit 1c65d1df authored Oct 13, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

nodecontroller.go pkg/controller/node/nodecontroller.go +14 -1

No files found.
--- a/pkg/controller/node/nodecontroller.go
+++ b/pkg/controller/node/nodecontroller.go
@@ -294,7 +294,20 @@ func NewNodeController(
 					return
 				}
-				node := obj.(*api.Node)
+				node, isNode := obj.(*api.Node)
+				// We can get DeletedFinalStateUnknown instead of *api.Node here and we need to handle that correctly. #34692
+				if !isNode {
+					deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
+					if !ok {
+						glog.Errorf("Received unexpected object: %v", obj)
+						return
+					}
+					node, ok = deletedState.Obj.(*api.Node)
+					if !ok {
+						glog.Errorf("DeletedFinalStateUnknown contained non-Node object: %v", deletedState.Obj)
+						return
+					}
+				}
 				if err := nc.cidrAllocator.ReleaseCIDR(node); err != nil {
 					glog.Errorf("Error releasing CIDR: %v", err)
 				}