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).
This commit is contained in:
@@ -35,6 +35,7 @@ import (
|
|||||||
kubeinformers "k8s.io/client-go/informers"
|
kubeinformers "k8s.io/client-go/informers"
|
||||||
"k8s.io/client-go/kubernetes"
|
"k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/client-go/kubernetes/scheme"
|
"k8s.io/client-go/kubernetes/scheme"
|
||||||
|
"k8s.io/client-go/kubernetes/typed/coordination/v1beta1"
|
||||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||||
"k8s.io/client-go/rest"
|
"k8s.io/client-go/rest"
|
||||||
"k8s.io/client-go/tools/clientcmd"
|
"k8s.io/client-go/tools/clientcmd"
|
||||||
@@ -140,13 +141,17 @@ func runRootCommand(ctx context.Context, c Opts) error {
|
|||||||
"watchedNamespace": c.KubeNamespace,
|
"watchedNamespace": c.KubeNamespace,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
var leaseClient v1beta1.LeaseInterface
|
||||||
|
if c.EnableNodeLease {
|
||||||
|
leaseClient = client.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease)
|
||||||
|
}
|
||||||
|
|
||||||
pNode := NodeFromProvider(ctx, c.NodeName, taint, p)
|
pNode := NodeFromProvider(ctx, c.NodeName, taint, p)
|
||||||
node, err := vkubelet.NewNode(
|
node, err := vkubelet.NewNode(
|
||||||
vkubelet.NaiveNodeProvider{},
|
vkubelet.NaiveNodeProvider{},
|
||||||
pNode,
|
pNode,
|
||||||
client.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease),
|
|
||||||
client.CoreV1().Nodes(),
|
client.CoreV1().Nodes(),
|
||||||
vkubelet.WithNodeDisableLease(!c.EnableNodeLease),
|
vkubelet.WithNodeEnableLeaseV1Beta1(leaseClient, nil),
|
||||||
vkubelet.WithNodeStatusUpdateErrorHandler(func(ctx context.Context, err error) error {
|
vkubelet.WithNodeStatusUpdateErrorHandler(func(ctx context.Context, err error) error {
|
||||||
if !k8serrors.IsNotFound(err) {
|
if !k8serrors.IsNotFound(err) {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user