mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-15 17:50:49 +00:00
Code Activity

Simplify usage of ObjectMeta fields

Browse source 
No need to explicitly spell out ObjectMeta as it's embedded in the
object types.
This commit is contained in:
Markus Lehtonen 2022-12-19 17:00:35 +02:00
parent e2296998d6
commit f5ae3fe2c7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/nfd-master/nfd-master.go
View file

@ -722,10 +722,10 @@ func (m *nfdMaster) processNodeFeatureRule(features *nfdv1alpha1.Features) (map[
for _, spec := range ruleSpecs { for _, spec := range ruleSpecs {
switch { switch {
case klog.V(3).Enabled(): case klog.V(3).Enabled():
h := fmt.Sprintf("executing NodeFeatureRule %q:", spec.ObjectMeta.Name) h := fmt.Sprintf("executing NodeFeatureRule %q:", spec.Name)
utils.KlogDump(3, h, " ", spec.Spec) utils.KlogDump(3, h, " ", spec.Spec)
case klog.V(1).Enabled(): case klog.V(1).Enabled():
klog.Infof("executing NodeFeatureRule %q", spec.ObjectMeta.Name) klog.Infof("executing NodeFeatureRule %q", spec.Name)
} }
for _, rule := range spec.Spec.Rules { for _, rule := range spec.Spec.Rules {
ruleOut, err := rule.Execute(features) ruleOut, err := rule.Execute(features)

14
test/e2e/node_feature_discovery.go
View file

@ -231,7 +231,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
By("Verifying the node where nfd-master is running") By("Verifying the node where nfd-master is running")
// Get updated masterPod object (we want to know where it was scheduled) // Get updated masterPod object (we want to know where it was scheduled)
masterPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(context.TODO(), masterPod.ObjectMeta.Name, metav1.GetOptions{}) masterPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(context.TODO(), masterPod.Name, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Node running nfd-master should have master version annotation // Node running nfd-master should have master version annotation
masterPodNode, err := f.ClientSet.CoreV1().Nodes().Get(context.TODO(), masterPod.Spec.NodeName, metav1.GetOptions{}) masterPodNode, err := f.ClientSet.CoreV1().Nodes().Get(context.TODO(), masterPod.Spec.NodeName, metav1.GetOptions{})
@ -239,7 +239,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
Expect(masterPodNode.Annotations).To(HaveKey(nfdv1alpha1.AnnotationNs + "/master.version")) Expect(masterPodNode.Annotations).To(HaveKey(nfdv1alpha1.AnnotationNs + "/master.version"))
By("Waiting for the nfd-master service to be up") By("Waiting for the nfd-master service to be up")
Expect(e2enetwork.WaitForService(f.ClientSet, f.Namespace.Name, nfdSvc.ObjectMeta.Name, true, time.Second, 10*time.Second)).NotTo(HaveOccurred()) Expect(e2enetwork.WaitForService(f.ClientSet, f.Namespace.Name, nfdSvc.Name, true, time.Second, 10*time.Second)).NotTo(HaveOccurred())
}) })
AfterEach(func() { AfterEach(func() {
@ -274,8 +274,8 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Waiting for the nfd-worker pod to succeed") By("Waiting for the nfd-worker pod to succeed")
Expect(e2epod.WaitForPodSuccessInNamespace(f.ClientSet, workerPod.ObjectMeta.Name, f.Namespace.Name)).NotTo(HaveOccurred()) Expect(e2epod.WaitForPodSuccessInNamespace(f.ClientSet, workerPod.Name, f.Namespace.Name)).NotTo(HaveOccurred())
workerPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(context.TODO(), workerPod.ObjectMeta.Name, metav1.GetOptions{}) workerPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(context.TODO(), workerPod.Name, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By(fmt.Sprintf("Making sure '%s' was decorated with the fake feature labels", workerPod.Spec.NodeName)) By(fmt.Sprintf("Making sure '%s' was decorated with the fake feature labels", workerPod.Spec.NodeName))
@ -295,7 +295,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
checkNodeFeatureObject(node.Name) checkNodeFeatureObject(node.Name)
By("Deleting the node-feature-discovery worker pod") By("Deleting the node-feature-discovery worker pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), workerPod.ObjectMeta.Name, metav1.DeleteOptions{}) err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), workerPod.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
}) })
@ -388,7 +388,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
} }
By("Deleting nfd-worker daemonset") By("Deleting nfd-worker daemonset")
err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(context.TODO(), workerDS.ObjectMeta.Name, metav1.DeleteOptions{}) err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(context.TODO(), workerDS.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
}) })
@ -489,7 +489,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
Expect(labelNegativeFound).To(BeFalse(), "label for not existing nodename found!") Expect(labelNegativeFound).To(BeFalse(), "label for not existing nodename found!")
By("Deleting nfd-worker daemonset") By("Deleting nfd-worker daemonset")
err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(context.TODO(), workerDS.ObjectMeta.Name, metav1.DeleteOptions{}) err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Delete(context.TODO(), workerDS.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
}) })