Merge pull request #69933 from wangzhen127/fix

Put node lease lister behind feature gate

Merge pull request #69933 from wangzhen127/fix
bc79dcfd · k8s-ci-robot · GitHub · 5f750c59 · 7bb61c56 · bc79dcfd
Unverified Commit bc79dcfd authored Oct 17, 2018 by k8s-ci-robot Committed by GitHub Oct 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

node_lifecycle_controller.go pkg/controller/nodelifecycle/node_lifecycle_controller.go +6 -1

No files found.
--- 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