Merge pull request #1248 from testwill/pkg-import

Remove pkg's imported twice

pkg/nfd-master/nfd-master-internal_test.go

@@ -38,7 +38,6 @@ import (
 	k8sclient "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 	"sigs.k8s.io/node-feature-discovery/pkg/apihelper"
-	"sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"
 	nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"
 	"sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/fake"
 	nfdscheme "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme"
@@ -507,7 +506,7 @@ func TestFilterLabels(t *testing.T) {
 		labelValue := "@test.feature.LSM"
 		features := nfdv1alpha1.Features{
 			Attributes: map[string]nfdv1alpha1.AttributeFeatureSet{
-				"test.feature": v1alpha1.AttributeFeatureSet{
+				"test.feature": nfdv1alpha1.AttributeFeatureSet{
 					Elements: map[string]string{
 						"LSM": "123",
 					},

test/e2e/node_feature_discovery_test.go

@@ -36,7 +36,6 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	taintutils "k8s.io/kubernetes/pkg/util/taints"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2elog "k8s.io/kubernetes/test/e2e/framework"
 	e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 	admissionapi "k8s.io/pod-security-admission/api"
@@ -222,7 +221,7 @@ var _ = SIGDescribe("NFD master and worker", func() {
 			JustBeforeEach(func(ctx context.Context) {
 				// Drop the pod security admission label as nfd-worker needs host mounts
 				if _, ok := f.Namespace.Labels[admissionapi.EnforceLevelLabel]; ok {
-					e2elog.Logf("Deleting %s label from the test namespace", admissionapi.EnforceLevelLabel)
+					framework.Logf("Deleting %s label from the test namespace", admissionapi.EnforceLevelLabel)
 					delete(f.Namespace.Labels, admissionapi.EnforceLevelLabel)
 					_, err := f.ClientSet.CoreV1().Namespaces().Update(ctx, f.Namespace, metav1.UpdateOptions{})
 					Expect(err).NotTo(HaveOccurred())
@@ -350,12 +349,12 @@ var _ = SIGDescribe("NFD master and worker", func() {
 					for _, node := range nodeList.Items {
 						nodeConf := testutils.FindNodeConfig(cfg, node.Name)
 						if nodeConf == nil {
-							e2elog.Logf("node %q has no matching rule in e2e-config, skipping...", node.Name)
+							framework.Logf("node %q has no matching rule in e2e-config, skipping...", node.Name)
 							continue
 						}
 
 						// Check labels
-						e2elog.Logf("verifying labels of node %q...", node.Name)
+						framework.Logf("verifying labels of node %q...", node.Name)
 						for k, v := range nodeConf.ExpectedLabelValues {
 							Expect(node.Labels).To(HaveKeyWithValue(k, v))
 						}
@@ -376,7 +375,7 @@ var _ = SIGDescribe("NFD master and worker", func() {
 						}
 
 						// Check annotations
-						e2elog.Logf("verifying annotations of node %q...", node.Name)
+						framework.Logf("verifying annotations of node %q...", node.Name)
 						for k, v := range nodeConf.ExpectedAnnotationValues {
 							Expect(node.Annotations).To(HaveKeyWithValue(k, v))
 						}