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-30 19:54:46 +00:00
Code Activity

test/e2e: drop dot imports

Browse source 
Make linter happy.
This commit is contained in:
Markus Lehtonen 2020-05-19 15:34:00 +03:00
parent 73602e8f28
commit 2f4e038f10
1 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
test/e2e/node_feature_discovery.go
View file

@ -34,8 +34,8 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
. "github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" "github.com/onsi/gomega"
master "sigs.k8s.io/node-feature-discovery/pkg/nfd-master" master "sigs.k8s.io/node-feature-discovery/pkg/nfd-master"
) )
@ -86,13 +86,13 @@ func readConfig() {
return return
} }
By("Reading end-to-end test configuration file") ginkgo.By("Reading end-to-end test configuration file")
data, err := ioutil.ReadFile(*e2eConfigFile) data, err := ioutil.ReadFile(*e2eConfigFile)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
By("Parsing end-to-end test configuration data") ginkgo.By("Parsing end-to-end test configuration data")
err = yaml.Unmarshal(data, &conf) err = yaml.Unmarshal(data, &conf)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
} }
// Create required RBAC configuration // Create required RBAC configuration
@ -363,14 +363,14 @@ func newHostPathType(typ v1.HostPathType) *v1.HostPathType {
// labels and annotations // labels and annotations
func cleanupNode(cs clientset.Interface) { func cleanupNode(cs clientset.Interface) {
nodeList, err := cs.CoreV1().Nodes().List(metav1.ListOptions{}) nodeList, err := cs.CoreV1().Nodes().List(metav1.ListOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
for _, n := range nodeList.Items { for _, n := range nodeList.Items {
var err error var err error
var node *v1.Node var node *v1.Node
for retry := 0; retry < 5; retry++ { for retry := 0; retry < 5; retry++ {
node, err = cs.CoreV1().Nodes().Get(n.Name, metav1.GetOptions{}) node, err = cs.CoreV1().Nodes().Get(n.Name, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
update := false update := false
// Remove labels // Remove labels
@ -393,7 +393,7 @@ func cleanupNode(cs clientset.Interface) {
break break
} }
By("Deleting NFD labels and annotations from node " + node.Name) ginkgo.By("Deleting NFD labels and annotations from node " + node.Name)
_, err = cs.CoreV1().Nodes().Update(node) _, err = cs.CoreV1().Nodes().Update(node)
if err != nil { if err != nil {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
@ -402,7 +402,7 @@ func cleanupNode(cs clientset.Interface) {
} }
} }
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
} }
} }
@ -410,42 +410,42 @@ func cleanupNode(cs clientset.Interface) {
var _ = framework.KubeDescribe("Node Feature Discovery", func() { var _ = framework.KubeDescribe("Node Feature Discovery", func() {
f := framework.NewDefaultFramework("node-feature-discovery") f := framework.NewDefaultFramework("node-feature-discovery")
Context("when deploying a single nfd-master pod", func() { ginkgo.Context("when deploying a single nfd-master pod", func() {
var masterPod *v1.Pod var masterPod *v1.Pod
BeforeEach(func() { ginkgo.BeforeEach(func() {
err := configureRBAC(f.ClientSet, f.Namespace.Name) err := configureRBAC(f.ClientSet, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
// Launch nfd-master // Launch nfd-master
By("Creating nfd master pod and nfd-master service") ginkgo.By("Creating nfd master pod and nfd-master service")
image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag) image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
masterPod = nfdMasterPod(image, false) masterPod = nfdMasterPod(image, false)
masterPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(masterPod) masterPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(masterPod)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
// Create nfd-master service // Create nfd-master service
nfdSvc, err := createService(f.ClientSet, f.Namespace.Name) nfdSvc, err := createService(f.ClientSet, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
By("Waiting for the nfd-master pod to be running") ginkgo.By("Waiting for the nfd-master pod to be running")
Expect(e2epod.WaitForPodRunningInNamespace(f.ClientSet, masterPod)).NotTo(HaveOccurred()) gomega.Expect(e2epod.WaitForPodRunningInNamespace(f.ClientSet, masterPod)).NotTo(gomega.HaveOccurred())
By("Waiting for the nfd-master service to be up") ginkgo.By("Waiting for the nfd-master service to be up")
Expect(framework.WaitForService(f.ClientSet, f.Namespace.Name, nfdSvc.ObjectMeta.Name, true, time.Second, 10*time.Second)).NotTo(HaveOccurred()) gomega.Expect(framework.WaitForService(f.ClientSet, f.Namespace.Name, nfdSvc.ObjectMeta.Name, true, time.Second, 10*time.Second)).NotTo(gomega.HaveOccurred())
}) })
AfterEach(func() { ginkgo.AfterEach(func() {
err := deconfigureRBAC(f.ClientSet, f.Namespace.Name) err := deconfigureRBAC(f.ClientSet, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
}) })
// //
// Simple test with only the fake source enabled // Simple test with only the fake source enabled
// //
Context("and a single worker pod with fake source enabled", func() { ginkgo.Context("and a single worker pod with fake source enabled", func() {
It("it should decorate the node with the fake feature labels", func() { ginkgo.It("it should decorate the node with the fake feature labels", func() {
fakeFeatureLabels := map[string]string{ fakeFeatureLabels := map[string]string{
master.LabelNs + "fake-fakefeature1": "true", master.LabelNs + "fake-fakefeature1": "true",
@ -457,34 +457,34 @@ var _ = framework.KubeDescribe("Node Feature Discovery", func() {
cleanupNode(f.ClientSet) cleanupNode(f.ClientSet)
// Launch nfd-worker // Launch nfd-worker
By("Creating a nfd worker pod") ginkgo.By("Creating a nfd worker pod")
image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag) image := fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
workerPod := nfdWorkerPod(image, []string{"--oneshot", "--sources=fake"}) workerPod := nfdWorkerPod(image, []string{"--oneshot", "--sources=fake"})
workerPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(workerPod) workerPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(workerPod)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
By("Waiting for the nfd-worker pod to succeed") ginkgo.By("Waiting for the nfd-worker pod to succeed")
Expect(e2epod.WaitForPodSuccessInNamespace(f.ClientSet, workerPod.ObjectMeta.Name, f.Namespace.Name)).NotTo(HaveOccurred()) gomega.Expect(e2epod.WaitForPodSuccessInNamespace(f.ClientSet, workerPod.ObjectMeta.Name, f.Namespace.Name)).NotTo(gomega.HaveOccurred())
workerPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(workerPod.ObjectMeta.Name, metav1.GetOptions{}) workerPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(workerPod.ObjectMeta.Name, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
By(fmt.Sprintf("Making sure '%s' was decorated with the fake feature labels", workerPod.Spec.NodeName)) ginkgo.By(fmt.Sprintf("Making sure '%s' was decorated with the fake feature labels", workerPod.Spec.NodeName))
node, err := f.ClientSet.CoreV1().Nodes().Get(workerPod.Spec.NodeName, metav1.GetOptions{}) node, err := f.ClientSet.CoreV1().Nodes().Get(workerPod.Spec.NodeName, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
for k, v := range fakeFeatureLabels { for k, v := range fakeFeatureLabels {
Expect(node.Labels[k]).To(Equal(v)) gomega.Expect(node.Labels[k]).To(gomega.Equal(v))
} }
// Check that there are no unexpected NFD labels // Check that there are no unexpected NFD labels
for k := range node.Labels { for k := range node.Labels {
if strings.HasPrefix(k, master.LabelNs) { if strings.HasPrefix(k, master.LabelNs) {
Expect(fakeFeatureLabels).Should(HaveKey(k)) gomega.Expect(fakeFeatureLabels).Should(gomega.HaveKey(k))
} }
} }
By("Deleting the node-feature-discovery worker pod") ginkgo.By("Deleting the node-feature-discovery worker pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(workerPod.ObjectMeta.Name, &metav1.DeleteOptions{}) err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(workerPod.ObjectMeta.Name, &metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
cleanupNode(f.ClientSet) cleanupNode(f.ClientSet)
}) })
@ -493,31 +493,31 @@ var _ = framework.KubeDescribe("Node Feature Discovery", func() {
// //
// More comprehensive test when --e2e-node-config is enabled // More comprehensive test when --e2e-node-config is enabled
// //
Context("and nfd-workers as a daemonset with default sources enabled", func() { ginkgo.Context("and nfd-workers as a daemonset with default sources enabled", func() {
It("the node labels listed in the e2e config should be present", func() { ginkgo.It("the node labels listed in the e2e config should be present", func() {
readConfig() readConfig()
if conf == nil { if conf == nil {
Skip("no e2e-config was specified") ginkgo.Skip("no e2e-config was specified")
} }
if conf.DefaultFeatures == nil { if conf.DefaultFeatures == nil {
Skip("no 'defaultFeatures' specified in e2e-config") ginkgo.Skip("no 'defaultFeatures' specified in e2e-config")
} }
fConf := conf.DefaultFeatures fConf := conf.DefaultFeatures
// Remove pre-existing stale annotations and labels // Remove pre-existing stale annotations and labels
cleanupNode(f.ClientSet) cleanupNode(f.ClientSet)
By("Creating nfd-worker daemonset") ginkgo.By("Creating nfd-worker daemonset")
workerDS := nfdWorkerDaemonSet(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag), []string{}) workerDS := nfdWorkerDaemonSet(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag), []string{})
workerDS, err := f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(workerDS) workerDS, err := f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(workerDS)
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
By("Waiting for daemonset pods to be ready") ginkgo.By("Waiting for daemonset pods to be ready")
Expect(e2epod.WaitForPodsReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 5)).NotTo(HaveOccurred()) gomega.Expect(e2epod.WaitForPodsReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 5)).NotTo(gomega.HaveOccurred())
By("Getting node objects") ginkgo.By("Getting node objects")
nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{}) nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
if _, ok := fConf.Nodes[node.Name]; !ok { if _, ok := fConf.Nodes[node.Name]; !ok {
@ -529,10 +529,10 @@ var _ = framework.KubeDescribe("Node Feature Discovery", func() {
// Check labels // Check labels
for k, v := range nodeConf.ExpectedLabelValues { for k, v := range nodeConf.ExpectedLabelValues {
Expect(node.Labels).To(HaveKeyWithValue(k, v)) gomega.Expect(node.Labels).To(gomega.HaveKeyWithValue(k, v))
} }
for k := range nodeConf.ExpectedLabelKeys { for k := range nodeConf.ExpectedLabelKeys {
Expect(node.Labels).To(HaveKey(k)) gomega.Expect(node.Labels).To(gomega.HaveKey(k))
} }
for k := range node.Labels { for k := range node.Labels {
if strings.HasPrefix(k, master.LabelNs) { if strings.HasPrefix(k, master.LabelNs) {
@ -543,16 +543,16 @@ var _ = framework.KubeDescribe("Node Feature Discovery", func() {
continue continue
} }
// Ignore if the label key was not whitelisted // Ignore if the label key was not whitelisted
Expect(fConf.LabelWhitelist).NotTo(HaveKey(k)) gomega.Expect(fConf.LabelWhitelist).NotTo(gomega.HaveKey(k))
} }
} }
// Check annotations // Check annotations
for k, v := range nodeConf.ExpectedAnnotationValues { for k, v := range nodeConf.ExpectedAnnotationValues {
Expect(node.Annotations).To(HaveKeyWithValue(k, v)) gomega.Expect(node.Annotations).To(gomega.HaveKeyWithValue(k, v))
} }
for k := range nodeConf.ExpectedAnnotationKeys { for k := range nodeConf.ExpectedAnnotationKeys {
Expect(node.Annotations).To(HaveKey(k)) gomega.Expect(node.Annotations).To(gomega.HaveKey(k))
} }
for k := range node.Annotations { for k := range node.Annotations {
if strings.HasPrefix(k, master.AnnotationNs) { if strings.HasPrefix(k, master.AnnotationNs) {
@ -563,19 +563,19 @@ var _ = framework.KubeDescribe("Node Feature Discovery", func() {
continue continue
} }
// Ignore if the annotation was not whitelisted // Ignore if the annotation was not whitelisted
Expect(fConf.AnnotationWhitelist).NotTo(HaveKey(k)) gomega.Expect(fConf.AnnotationWhitelist).NotTo(gomega.HaveKey(k))
} }
} }
// Node running nfd-master should have master version annotation // Node running nfd-master should have master version annotation
if node.Name == masterPod.Spec.NodeName { if node.Name == masterPod.Spec.NodeName {
Expect(node.Annotations).To(HaveKey(master.AnnotationNs + "master.version")) gomega.Expect(node.Annotations).To(gomega.HaveKey(master.AnnotationNs + "master.version"))
} }
} }
By("Deleting nfd-worker daemonset") ginkgo.By("Deleting nfd-worker daemonset")
err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(workerDS.ObjectMeta.Name, &metav1.DeleteOptions{}) err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(workerDS.ObjectMeta.Name, &metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
cleanupNode(f.ClientSet) cleanupNode(f.ClientSet)
}) })