Skip to content

K
k3s
Commit cb6be1eb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46637 from mtaufen/fix-nodecontroller-log

Automatic merge from submit-queue (batch tested with PRs 46635, 45619, 46637, 45059, 46415) fix a comment and log message in the nodecontroller I was poking around in the nodecontroller code and this looked wrong.
parents 4e531f61 f848756c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/controller/node/nodecontroller.go
View file @ cb6be1eb
...@@ -294,7 +294,7 @@ func NewNodeController( ...@@ -294,7 +294,7 @@ func NewNodeController(
}, },
DeleteFunc: func(obj interface{}) { DeleteFunc: func(obj interface{}) {
pod, isPod := obj.(*v1.Pod) pod, isPod := obj.(*v1.Pod)
// We can get DeletedFinalStateUnknown instead of *v1.Node here and we need to handle that correctly. #34692 // We can get DeletedFinalStateUnknown instead of *v1.Pod here and we need to handle that correctly.
if !isPod { if !isPod {
deletedState, ok := obj.(cache.DeletedFinalStateUnknown) deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok { if !ok {
...@@ -303,7 +303,7 @@ func NewNodeController( ...@@ -303,7 +303,7 @@ func NewNodeController(
} }
pod, ok = deletedState.Obj.(*v1.Pod) pod, ok = deletedState.Obj.(*v1.Pod)
if !ok { if !ok {
glog.Errorf("DeletedFinalStateUnknown contained non-Node object: %v", deletedState.Obj) glog.Errorf("DeletedFinalStateUnknown contained non-Pod object: %v", deletedState.Obj)
return return
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment