From b6eeb88316067103d2019b9aad6d539aeb4f9857 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Tue, 4 Jun 2019 16:44:00 -0700
Subject: [PATCH] Update node defaults

Do not enable leases by default in the node constructor.
Simplify node constructor to not require a lease client when leases may
not even be enabled.

Updates node status update interval to the kubelet default of 10s (was
5s in vk).
---
 virtual-kubelet/commands/root/root.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/virtual-kubelet/commands/root/root.go b/virtual-kubelet/commands/root/root.go
index c8813f1..0c91fe6 100644
--- a/virtual-kubelet/commands/root/root.go
+++ b/virtual-kubelet/commands/root/root.go
@@ -35,6 +35,7 @@ import (
 	kubeinformers "k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/kubernetes/typed/coordination/v1beta1"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -140,13 +141,17 @@ func runRootCommand(ctx context.Context, c Opts) error {
 		"watchedNamespace": c.KubeNamespace,
 	}))
 
+	var leaseClient v1beta1.LeaseInterface
+	if c.EnableNodeLease {
+		leaseClient = client.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease)
+	}
+
 	pNode := NodeFromProvider(ctx, c.NodeName, taint, p)
 	node, err := vkubelet.NewNode(
 		vkubelet.NaiveNodeProvider{},
 		pNode,
-		client.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease),
 		client.CoreV1().Nodes(),
-		vkubelet.WithNodeDisableLease(!c.EnableNodeLease),
+		vkubelet.WithNodeEnableLeaseV1Beta1(leaseClient, nil),
 		vkubelet.WithNodeStatusUpdateErrorHandler(func(ctx context.Context, err error) error {
 			if !k8serrors.IsNotFound(err) {
 				return err