Skip to content

Commit 4d1b251

Browse files
committed
kubectl-nfd/test: rework kubectl 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.
1 parent 33571d4 commit 4d1b251

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/kubectl-nfd/test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ func Test(nodefeaturerulepath, nodeName, kubeconfig string) []error {
3636
var errs []error
3737
var err error
3838

39-
nfr := nfdv1alpha1.NodeFeatureRule{}
40-
41-
if kubeconfig == "" {
42-
kubeconfig = os.Getenv("KUBECONFIG")
39+
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
40+
if kubeconfig != "" {
41+
loadingRules.ExplicitPath = kubeconfig
4342
}
44-
config, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
43+
config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{}).ClientConfig()
4544
if err != nil {
4645
return []error{fmt.Errorf("error building kubeconfig: %w", err)}
4746
}
@@ -74,6 +73,7 @@ func Test(nodefeaturerulepath, nodeName, kubeconfig string) []error {
7473
return []error{fmt.Errorf("error reading NodeFeatureRule file: %w", err)}
7574
}
7675

76+
nfr := nfdv1alpha1.NodeFeatureRule{}
7777
err = yaml.Unmarshal(nfrFile, &nfr)
7878
if err != nil {
7979
return []error{fmt.Errorf("error parsing NodeFeatureRule: %w", err)}

0 commit comments

Comments
 (0)