mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-13 20:30:03 +00:00
Code Activity

test/e2e: refactor setup and cleanup

Browse source
This commit is contained in:
Markus Lehtonen 2022-07-06 14:42:01 +03:00
parent d3446b68c3
commit 190e3200b1
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/e2e/node_feature_discovery.go
View file

@ -104,6 +104,9 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
err := testutils.ConfigureRBAC(f.ClientSet, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred())
// Remove pre-existing stale annotations and labels
cleanupNode(f.ClientSet)
// Launch nfd-master
By("Creating nfd master pod and nfd-master service")
image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
@ -130,9 +133,9 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
})
AfterEach(func() {
err := testutils.DeconfigureRBAC(f.ClientSet, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred())
Expect(testutils.DeconfigureRBAC(f.ClientSet, f.Namespace.Name)).NotTo(HaveOccurred())
cleanupNode(f.ClientSet)
})
//
@ -147,9 +150,6 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
master.FeatureLabelNs + "/fake-fakefeature3": "true",
}
// Remove pre-existing stale annotations and labels
cleanupNode(f.ClientSet)
// Launch nfd-worker
By("Creating a nfd worker pod")
image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
@ -179,8 +179,6 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
By("Deleting the node-feature-discovery worker pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), workerPod.ObjectMeta.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())
cleanupNode(f.ClientSet)
})
})
@ -200,9 +198,6 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
}
fConf := cfg.DefaultFeatures
// Remove pre-existing stale annotations and labels
cleanupNode(f.ClientSet)
By("Creating nfd-worker daemonset")
workerDS := testutils.NFDWorkerDaemonSet(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag), []string{})
workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{})
@ -269,8 +264,6 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
By("Deleting nfd-worker daemonset")
err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(context.TODO(), workerDS.ObjectMeta.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())
cleanupNode(f.ClientSet)
})
})
@ -279,9 +272,6 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
//
Context("and nfd-workers as a daemonset with 2 additional configmaps for the custom source configured", func() {
It("the nodename matching features listed in the configmaps should be present", func() {
// Remove pre-existing stale annotations and labels
cleanupNode(f.ClientSet)
By("Getting a worker node")
// We need a valid nodename for the configmap
@ -426,8 +416,6 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
By("Deleting nfd-worker daemonset")
err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(context.TODO(), workerDS.ObjectMeta.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())
cleanupNode(f.ClientSet)
})
})