Merge pull request #2350 from marquiz/devel/kubectl-plugin

kubectl-nfd: fix test subcommand

Author: k8s-ci-robot

cmd/kubectl-nfd/subcmd/test.go

@@ -49,8 +49,10 @@ func init() {
 	testCmd.Flags().StringVarP(&nodefeaturerule, "nodefeaturerule-file", "f", "", "Path to the NodeFeatureRule file to validate")
 	testCmd.Flags().StringVarP(&node, "nodename", "n", "", "Node to validate against")
 	testCmd.Flags().StringVarP(&kubeconfig, "kubeconfig", "k", "", "kubeconfig file to use")
-	err := testCmd.MarkFlagRequired("nodefeaturerule-file")
-	if err != nil {
+	if err := testCmd.MarkFlagRequired("nodefeaturerule-file"); err != nil {
+		panic(err)
+	}
+	if err := testCmd.MarkFlagRequired("nodename"); err != nil {
 		panic(err)
 	}
 }

pkg/kubectl-nfd/test.go

@@ -17,15 +17,16 @@ limitations under the License.
 package kubectlnfd
 
 import (
+	"context"
 	"fmt"
 	"os"
-	"time"
+	"strings"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8sLabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/clientcmd"
 
 	nfdclientset "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
-	nfdinformers "sigs.k8s.io/node-feature-discovery/api/generated/informers/externalversions"
 	nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/nfd/v1alpha1"
 
 	"sigs.k8s.io/yaml"
@@ -46,14 +47,19 @@ func Test(nodefeaturerulepath, nodeName, kubeconfig string) []error {
 	}
 
 	nfdClient := nfdclientset.NewForConfigOrDie(config)
-	informerFactory := nfdinformers.NewSharedInformerFactory(nfdClient, 1*time.Second)
-	featureLister := informerFactory.Nfd().V1alpha1().NodeFeatures().Lister()
 
 	sel := k8sLabels.SelectorFromSet(k8sLabels.Set{nfdv1alpha1.NodeFeatureObjNodeNameLabel: nodeName})
-	objs, err := featureLister.List(sel)
+	list, err := nfdClient.NfdV1alpha1().NodeFeatures(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{LabelSelector: sel.String()})
 	if err != nil {
 		return []error{fmt.Errorf("failed to get NodeFeature resources for node %q: %w", nodeName, err)}
 	}
+	objs := list.Items
+	names := make([]string, len(objs))
+	for i, o := range objs {
+		names[i] = o.Namespace + "/" + o.Name
+	}
+	fmt.Printf("Found %d NodeFeature objects for node %q: %s\n", len(objs), nodeName, strings.Join(names, ", "))
+
 	features := nfdv1alpha1.NewNodeFeatureSpec()
 	if len(objs) > 0 {
 		features = objs[0].Spec.DeepCopy()