From fa9079b6323b7a973432b302fd2a5346fb231cb3 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 30 Oct 2025 13:11:10 +0200 Subject: [PATCH] kubectl-nfd/test: rework kubeconfig initialization The biggest change is that the default kubeconfig is the same as for kubeconfig ($HOME/.kube/config) instead of in-cluster config. Makes usage easier as now the --kubeconfig flag is not normally needed. --- pkg/kubectl-nfd/test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubectl-nfd/test.go b/pkg/kubectl-nfd/test.go index 866d2e192a..da4e29e4a5 100644 --- a/pkg/kubectl-nfd/test.go +++ b/pkg/kubectl-nfd/test.go @@ -36,12 +36,11 @@ func Test(nodefeaturerulepath, nodeName, kubeconfig string) []error { var errs []error var err error - nfr := nfdv1alpha1.NodeFeatureRule{} - - if kubeconfig == "" { - kubeconfig = os.Getenv("KUBECONFIG") + loadingRules := clientcmd.NewDefaultClientConfigLoadingRules() + if kubeconfig != "" { + loadingRules.ExplicitPath = kubeconfig } - config, err := clientcmd.BuildConfigFromFlags("", kubeconfig) + config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{}).ClientConfig() if err != nil { return []error{fmt.Errorf("error building kubeconfig: %w", err)} } @@ -74,6 +73,7 @@ func Test(nodefeaturerulepath, nodeName, kubeconfig string) []error { return []error{fmt.Errorf("error reading NodeFeatureRule file: %w", err)} } + nfr := nfdv1alpha1.NodeFeatureRule{} err = yaml.Unmarshal(nfrFile, &nfr) if err != nil { return []error{fmt.Errorf("error parsing NodeFeatureRule: %w", err)}