Merge pull request #69933 from wangzhen127/fix

Put node lease lister behind feature gate
kubernetes · Oct 17, 2018 · bc79dcf · bc79dcf
2 parents 5f750c5 + 7bb61c5
commit bc79dcf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller.go b/pkg/controller/nodelifecycle/node_lifecycle_controller.go
@@ -388,7 +388,12 @@ func NewNodeLifecycleController(
 	})
 
 	nc.leaseLister = leaseInformer.Lister()
-	nc.leaseInformerSynced = leaseInformer.Informer().HasSynced
+	if utilfeature.DefaultFeatureGate.Enabled(features.NodeLease) {
+		nc.leaseInformerSynced = leaseInformer.Informer().HasSynced
+	} else {
+		// Always indicate that lease is synced to prevent syncing lease.
+		nc.leaseInformerSynced = func() bool { return true }
+	}
 
 	nc.nodeLister = nodeInformer.Lister()
 	nc.nodeInformerSynced = nodeInformer.Informer().HasSynced