From 67be3c681db4759b43e74e360327c7a5e443e462 Mon Sep 17 00:00:00 2001 From: lubingtan Date: Fri, 30 Sep 2022 09:47:22 +0800 Subject: [PATCH] Add default client Signed-off-by: lubingtan --- node/nodeutil/controller.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/node/nodeutil/controller.go b/node/nodeutil/controller.go index 09b3b7cc1..cc09ab07c 100644 --- a/node/nodeutil/controller.go +++ b/node/nodeutil/controller.go @@ -306,6 +306,8 @@ func NewNode(name string, newProvider NewProviderFunc, opts ...NodeOpt) (*Node, }, } + cfg.Client = defaultClientFromEnv(cfg.KubeconfigPath) + for _, o := range opts { if err := o(&cfg); err != nil { return nil, err @@ -317,11 +319,7 @@ func NewNode(name string, newProvider NewProviderFunc, opts ...NodeOpt) (*Node, } if cfg.Client == nil { - var err error - cfg.Client, err = ClientsetFromEnv(cfg.KubeconfigPath) - if err != nil { - return nil, errors.Wrap(err, "error creating clientset from env") - } + return nil, errors.New("no client provided") } podInformerFactory := informers.NewSharedInformerFactoryWithOptions( @@ -429,3 +427,12 @@ func setNodeReady(n *v1.Node) { return } } + +func defaultClientFromEnv(kubeconfigPath string) kubernetes.Interface { + client, err := ClientsetFromEnv(kubeconfigPath) + if err != nil { + log.G(context.TODO()).WithError(err). + Warn("Failed to create clientset from env. Ignore this error If you use your own client") + } + return client +}