e2e: topology-updater: add e2e test for exclude-list feature

Signed-off-by: Talor Itzhak <titzhak@redhat.com>

test/e2e/topology_updater.go

@@ -67,11 +67,9 @@ var _ = SIGDescribe("Node Feature Discovery topology updater", func() {
 		}
 
 		By("Creating the node resource topologies CRD")
-		_, err = testutils.CreateNodeResourceTopologies(extClient)
+		Expect(testutils.CreateNodeResourceTopologies(extClient)).ToNot(BeNil())
-		Expect(err).NotTo(HaveOccurred())
 
-		err = testutils.ConfigureRBAC(f.ClientSet, f.Namespace.Name)
+		Expect(testutils.ConfigureRBAC(f.ClientSet, f.Namespace.Name)).NotTo(HaveOccurred())
-		Expect(err).NotTo(HaveOccurred())
 
 		image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
 		f.PodClient().CreateSync(testutils.NFDMasterPod(image, false))
@@ -105,6 +103,14 @@ var _ = SIGDescribe("Node Feature Discovery topology updater", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	// TODO: replace with regular AfterEach once we have https://github.com/kubernetes/kubernetes/pull/111998 in
+	f.AddAfterEach("Node Feature Discovery topology updater CRD and RBAC removal", func(f *framework.Framework, failed bool) {
+		err := testutils.DeconfigureRBAC(f.ClientSet, f.Namespace.Name)
+		if err != nil {
+			framework.Logf("failed to delete RBAC resources: %v", err)
+		}
+	})
+
 	Context("with single nfd-master pod", func() {
 		BeforeEach(func() {
 			cfg, err := testutils.GetConfig()
@@ -252,11 +258,50 @@ var _ = SIGDescribe("Node Feature Discovery topology updater", func() {
 
 	})
 
-	JustAfterEach(func() {
+	When("topology-updater configure to exclude memory", func() {
-		err := testutils.DeconfigureRBAC(f.ClientSet, f.Namespace.Name)
+		var topologyUpdaterConfigMap *corev1.ConfigMap
-		if err != nil {
+
-			framework.Logf("failed to delete RBAC resources: %v", err)
+		BeforeEach(func() {
-		}
+			data := make(map[string]string)
+			data["nfd-topology-updater.conf"] = `excludeList:
+  '*': [memory]
+`
+			topologyUpdaterConfigMap = &corev1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "nfd-topology-updater-conf",
+				},
+				Data: data,
+			}
+
+			cm, err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.TODO(), topologyUpdaterConfigMap, metav1.CreateOptions{})
+			Expect(err).ToNot(HaveOccurred())
+
+			cfg, err := testutils.GetConfig()
+			Expect(err).ToNot(HaveOccurred())
+
+			kcfg := cfg.GetKubeletConfig()
+			By(fmt.Sprintf("Using config (%#v)", kcfg))
+
+			opts := testutils.SpecWithConfigMap(cm.Name, cm.Name, "/etc/kubernetes/node-feature-discovery")
+			topologyUpdaterDaemonSet = testutils.NFDTopologyUpdaterDaemonSet(kcfg, fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag), []string{}, opts)
+		})
+
+		It("noderesourcetopology should not advertise the memory resource", func() {
+			Eventually(func() bool {
+				memoryFound := false
+				nodeTopology := testutils.GetNodeTopology(topologyClient, topologyUpdaterNode.Name)
+				for _, zone := range nodeTopology.Zones {
+					for _, res := range zone.Resources {
+						if res.Name == string(corev1.ResourceMemory) {
+							memoryFound = true
+							framework.Logf("resource:%s was found for nodeTopology:%s on zone:%s while it should not", corev1.ResourceMemory, nodeTopology.Name, zone.Name)
+							break
+						}
+					}
+				}
+				return memoryFound
+			}, 1*time.Minute, 10*time.Second).Should(BeFalse())
+		})
 	})
 })
 

test/e2e/utils/pod.go

@@ -176,11 +176,37 @@ func NFDWorkerDaemonSet(image string, extraArgs []string) *appsv1.DaemonSet {
 }
 
 // NFDTopologyUpdaterDaemonSet provides the NFD daemon set topology updater
-func NFDTopologyUpdaterDaemonSet(kc KubeletConfig, image string, extraArgs []string) *appsv1.DaemonSet {
+func NFDTopologyUpdaterDaemonSet(kc KubeletConfig, image string, extraArgs []string, options ...func(spec *corev1.PodSpec)) *appsv1.DaemonSet {
 	podSpec := nfdTopologyUpdaterPodSpec(kc, image, extraArgs)
+	for _, o := range options {
+		o(podSpec)
+	}
 	return newDaemonSet("nfd-topology-updater", podSpec)
 }
 
+func SpecWithConfigMap(cmName, volumeName, mountPath string) func(spec *corev1.PodSpec) {
+	return func(spec *corev1.PodSpec) {
+		spec.Volumes = append(spec.Volumes,
+			corev1.Volume{
+				Name: volumeName,
+				VolumeSource: corev1.VolumeSource{
+					ConfigMap: &corev1.ConfigMapVolumeSource{
+						LocalObjectReference: corev1.LocalObjectReference{
+							Name: cmName,
+						},
+					},
+				},
+			})
+		cnt := &spec.Containers[0]
+		cnt.VolumeMounts = append(cnt.VolumeMounts,
+			corev1.VolumeMount{
+				Name:      volumeName,
+				ReadOnly:  true,
+				MountPath: mountPath,
+			})
+	}
+}
+
 // newDaemonSet provide the new daemon set
 func newDaemonSet(name string, podSpec *corev1.PodSpec) *appsv1.DaemonSet {
 	return &appsv1.DaemonSet{