Merge pull request #51603 from hzxuzhonghu/taint-controller-panic

Automatic merge from submit-queue (batch tested with PRs 51603, 51653) fix taint controller panic **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #51586 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #51603 from hzxuzhonghu/taint-controller-panic
ecfee6a9 · Kubernetes Submit Queue · GitHub · 8b9f0ea5 · 928ac582 · ecfee6a9
Commit ecfee6a9 authored Sep 06, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

node_controller.go pkg/controller/node/node_controller.go +1 -1

No files found.
--- a/pkg/controller/node/node_controller.go
+++ b/pkg/controller/node/node_controller.go
@@ -376,6 +376,7 @@ func NewNodeController(
 	}

 	if nc.runTaintManager {
+		nc.taintManager = scheduler.NewNoExecuteTaintManager(kubeClient)
 		nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 			AddFunc: util.CreateAddNodeHandler(func(node *v1.Node) error {
 				nc.taintManager.NodeUpdated(nil, node)
@@ -390,7 +391,6 @@ func NewNodeController(
 				return nil
 			}),
 		})
-		nc.taintManager = scheduler.NewNoExecuteTaintManager(kubeClient)
 	}

 	if nc.taintNodeByCondition {