[AA] e2e: klog: Infof -> InfoS

These changes where AI-Assisted (hence the AA tag).

Finding manually all the instances:
```
git grep Infof test/e2e | cut -d: -f1 | uniq -c
```

Initial prompt:
```
Translate the calls to `klog.Infof` to `klog.InfoS`. Since the function signatures are different, rearrange the parameters to match the signature of the `InfoS` function. Modify only the file `test/e2e/tools/mkginkgolabelfilter_test.go`
```

Subsequent N prompts (roughly 15-25 calls to fix per prompt)
```
do the same for the files ...
```

files picked randomly by the user

Assisted-by: Cursor AI
Assisted-by-model: claude-4-sonnet
Signed-off-by: Francesco Romani <[email protected]>

Author: ffromani

test/e2e/sched/uninstall/uninstall_test.go

@@ -66,7 +66,7 @@ var _ = Describe("[Scheduler] uninstall", func() {
 					key := client.ObjectKeyFromObject(obj)
 					if err := e2eclient.Client.Get(context.TODO(), key, obj); !errors.IsNotFound(err) {
 						if err == nil {
-							klog.Infof("obj %s still exists", key.String())
+							klog.InfoS("obj still exists", "key", key.String())
 						} else {
 							klog.ErrorS(err, "obj return with error", "key", key.String())
 						}

test/e2e/serial/config/config.go

@@ -137,7 +137,7 @@ func validateTopologyManagerConfiguration(kconfigs map[string]*kubeletconfigv1be
 		}
 		kconfTMPolicy := kconfig.TopologyManagerPolicy
 		if kconfTMPolicy == "" {
-			klog.Infof("Topology Manager Policy not set in kubeletconfig, fixing to %q", tmPolicyDefault)
+			klog.InfoS("Topology Manager Policy not set in kubeletconfig, fixing", "policy", tmPolicyDefault)
 			kconfTMPolicy = tmPolicyDefault
 		}
 		if nrtTMPolicy.Value != kconfTMPolicy {
@@ -152,7 +152,7 @@ func validateTopologyManagerConfiguration(kconfigs map[string]*kubeletconfigv1be
 		}
 		kconfTMScope := kconfig.TopologyManagerScope
 		if kconfTMScope == "" {
-			klog.Infof("Topology Manager Scope not set in kubeletconfig, fixing to %q", tmScopeDefault)
+			klog.InfoS("Topology Manager Scope not set in kubeletconfig, fixing", "scope", tmScopeDefault)
 			kconfTMScope = tmScopeDefault
 		}
 		if nrtTMScope.Value != kconfTMScope {

test/e2e/serial/tests/non_regression_fundamentals.go

@@ -85,7 +85,7 @@ var _ = Describe("numaresources fundamentals non-regression", Serial, Label("ser
 					e2efixture.Skip(fxt, "Scheduler cache not enabled")
 				}
 				timeout := nroSchedObj.Status.CacheResyncPeriod.Round(time.Second) * 10
-				klog.Infof("pod running timeout: %v", timeout)
+				klog.InfoS("pod running timeout", "timeout", timeout)
 
 				nrts := e2enrt.FilterZoneCountEqual(nrtList.Items, 2)
 				if len(nrts) < 1 {
@@ -96,7 +96,7 @@ var _ = Describe("numaresources fundamentals non-regression", Serial, Label("ser
 				targetNodeName, ok := e2efixture.PopNodeName(nodesNames)
 				Expect(ok).To(BeTrue())
 
-				klog.Infof("selected target node name: %q", targetNodeName)
+				klog.InfoS("selected target node name", "nodeName", targetNodeName)
 
 				nrtInfo, err := e2enrt.FindFromList(nrts, targetNodeName)
 				Expect(err).ToNot(HaveOccurred())
@@ -116,7 +116,7 @@ var _ = Describe("numaresources fundamentals non-regression", Serial, Label("ser
 				// CAUTION: still assuming all NUMA zones are equal across all nodes
 				numPods := int(cpusVal / cpusPerPod) // unlikely we will need more than a billion pods (!!)
 
-				klog.Infof("creating %d pods consuming %d cpus each (found %d per NUMA zone)", numPods, cpusVal, maxAllocPerNUMAVal)
+				klog.InfoS("creating pods", "numPods", numPods, "cpusPerPod", cpusVal, "maxAllocPerNUMAZone", maxAllocPerNUMAVal)
 
 				var testPods []*corev1.Pod
 				for idx := 0; idx < numPods; idx++ {
@@ -180,7 +180,7 @@ var _ = Describe("numaresources fundamentals non-regression", Serial, Label("ser
 					e2efixture.Skip(fxt, "Scheduler cache not enabled")
 				}
 				timeout := nroSchedObj.Status.CacheResyncPeriod.Round(time.Second) * 10
-				klog.Infof("pod running timeout: %v", timeout)
+				klog.InfoS("pod running timeout", "timeout", timeout)
 
 				nrts := e2enrt.FilterZoneCountEqual(nrtList.Items, 2)
 				if len(nrts) < 1 {
@@ -193,7 +193,7 @@ var _ = Describe("numaresources fundamentals non-regression", Serial, Label("ser
 				referenceNodeName, ok := e2efixture.PopNodeName(nodesNames)
 				Expect(ok).To(BeTrue())
 
-				klog.Infof("selected reference node name: %q", referenceNodeName)
+				klog.InfoS("selected reference node name", "nodeName", referenceNodeName)
 
 				nrtInfo, err := e2enrt.FindFromList(nrts, referenceNodeName)
 				Expect(err).ToNot(HaveOccurred())
@@ -211,7 +211,7 @@ var _ = Describe("numaresources fundamentals non-regression", Serial, Label("ser
 				cpusVal := (10 * resVal) / 8
 				numPods := int(int64(len(nrts)) * cpusVal / cpusPerPod) // unlikely we will need more than a billion pods (!!)
 
-				klog.Infof("creating %d pods consuming %d cpus each (found %d per NUMA zone)", numPods, cpusVal, resVal)
+				klog.InfoS("creating pods", "numPods", numPods, "cpusPerPod", cpusVal, "resPerNUMAZone", resVal)
 
 				var testPods []*corev1.Pod
 				for idx := 0; idx < numPods; idx++ {

test/e2e/serial/tests/tolerations.go

@@ -283,7 +283,7 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 				extraTols = false
 				By("waiting for DaemonSet to be ready")
 				// note we still have the taint
-				klog.Infof("ensuring the RTE DS is running with less pods because taints (expected pods=%d)", len(workers)-1)
+				klog.InfoS("ensuring the RTE DS is running with less pods because taints", "expectedPods", len(workers)-1)
 				_, err = wait.With(fxt.Client).Interval(10*time.Second).Timeout(1*time.Minute).ForDaemonsetPodsCreation(ctx, dsKey, len(workers)-1)
 				Expect(err).ToNot(HaveOccurred(), "daemonset %s did not start updated: %v", dsKey.String(), err)
 				_, err = wait.With(fxt.Client).Interval(10*time.Second).Timeout(3*time.Minute).ForDaemonSetReadyByKey(ctx, dsKey)
@@ -312,14 +312,14 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 				Expect(err).ToNot(HaveOccurred())
 				tnt = &tnts[0]
 
-				klog.Infof("randomly picking the target node (among %d)", len(workers))
+				klog.InfoS("randomly picking the target node", "totalNodes", len(workers))
 				targetIdx, ok := e2efixture.PickNodeIndex(workers)
 				Expect(ok).To(BeTrue())
 				taintedNode := &workers[targetIdx]
 
 				applyTaintToNode(ctx, fxt.Client, taintedNode, tnt)
 				targetNodeNames = append(targetNodeNames, taintedNode.Name)
-				klog.Infof("considering node: %q tainted with %q", taintedNode.Name, tnt.String())
+				klog.InfoS("considering node tainted", "node", taintedNode.Name, "taint", tnt.String())
 
 				By(fmt.Sprintf("ensuring the RTE DS was created with expected pods count=%d", len(workers)))
 				ds, err := wait.With(fxt.Client).Interval(time.Second).Timeout(3*time.Minute).ForDaemonsetPodsCreation(ctx, dsKey, len(workers))
@@ -340,7 +340,7 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 				_, err = wait.With(fxt.Client).Interval(10*time.Second).Timeout(3*time.Minute).ForDaemonSetReadyByKey(ctx, dsKey)
 				Expect(err).ToNot(HaveOccurred(), "failed to get the daemonset %s: %v", dsKey.String(), err)
 
-				klog.Infof("verify the rte pod on node %q is evicted", taintedNode.Name)
+				klog.InfoS("verify the rte pod on node is evicted", "node", taintedNode.Name)
 				err = wait.With(fxt.Client).Timeout(2*time.Minute).ForPodDeleted(ctx, podOnNode.Namespace, podOnNode.Name)
 				Expect(err).ToNot(HaveOccurred(), "pod %s/%s still exists", podOnNode.Namespace, podOnNode.Name)
 			})
@@ -356,14 +356,14 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 				Expect(err).ToNot(HaveOccurred())
 				tnt = &tnts[0]
 
-				klog.Infof("randomly picking the target node (among %d)", len(workers))
+				klog.InfoS("randomly picking the target node", "totalNodes", len(workers))
 				targetIdx, ok := e2efixture.PickNodeIndex(workers)
 				Expect(ok).To(BeTrue())
 				taintedNode := &workers[targetIdx]
 
 				applyTaintToNode(ctx, fxt.Client, taintedNode, tnt)
 				targetNodeNames = append(targetNodeNames, taintedNode.Name)
-				klog.Infof("considering node: %q tainted with %q", taintedNode.Name, tnt.String())
+				klog.InfoS("considering node tainted", "node", taintedNode.Name, "taint", tnt.String())
 
 				By("add toleration to the NROP CR")
 				tolerateVal1 := []corev1.Toleration{
@@ -393,15 +393,15 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 				tnt = &tnts[0]
 
 				applyTaintToNode(ctx, fxt.Client, taintedNode, tnt)
-				klog.Infof("considering node: %q tainted with %q", taintedNode.Name, tnt.String())
+				klog.InfoS("considering node tainted", "node", taintedNode.Name, "taint", tnt.String())
 
 				By(fmt.Sprintf("waiting for daemonset %v to report correct pods' number", dsKey.String()))
 				updatedDs, err := wait.With(fxt.Client).Interval(time.Second).Timeout(time.Minute).ForDaemonsetPodsCreation(ctx, dsKey, len(workers)-1)
 				Expect(err).NotTo(HaveOccurred(), "pods number is not as expected for RTE daemonset: expected %d found %d", len(workers)-1, updatedDs.Status.CurrentNumberScheduled)
 				_, err = wait.With(e2eclient.Client).Interval(10*time.Second).Timeout(3*time.Minute).ForDaemonSetReadyByKey(ctx, dsKey)
 				Expect(err).ToNot(HaveOccurred(), "failed to get the daemonset ready: %v", err)
 
-				klog.Infof("verify the rte pod on node %q is evicted", taintedNode.Name)
+				klog.InfoS("verify the rte pod on node is evicted", "node", taintedNode.Name)
 				err = wait.With(fxt.Client).Timeout(2*time.Minute).ForPodDeleted(ctx, podOnNode.Namespace, podOnNode.Name)
 				Expect(err).ToNot(HaveOccurred(), "pod %s/%s still exists", podOnNode.Namespace, podOnNode.Name)
 			})
@@ -496,7 +496,7 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 
 				applyTaintToNode(ctx, fxt.Client, taintedNode, tnt)
 				targetNodeNames = append(targetNodeNames, taintedNode.Name)
-				klog.Infof("considering node: %q tainted with %q", taintedNode.Name, tnt.String())
+				klog.InfoS("considering node tainted", "node", taintedNode.Name, "taint", tnt.String())
 
 				By("trigger an RTE pod restart on the tainted node by deleting the pod")
 				ds := appsv1.DaemonSet{}
@@ -517,7 +517,7 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 				}
 				Expect(podToDelete.Name).NotTo(Equal(""), "RTE pod was not found on node %q", taintedNode.Name)
 
-				klog.Infof("delete the pod %s/%s of the tainted node", podToDelete.Namespace, podToDelete.Name)
+				klog.InfoS("delete the pod of the tainted node", "namespace", podToDelete.Namespace, "name", podToDelete.Name)
 				err = fxt.Client.Delete(ctx, &podToDelete)
 				Expect(err).ToNot(HaveOccurred())
 				err = wait.With(fxt.Client).Timeout(2*time.Minute).ForPodDeleted(ctx, podToDelete.Namespace, podToDelete.Name)
@@ -594,7 +594,7 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 
 					applyTaintToNode(ctx, fxt.Client, taintedNode, tnt)
 					targetNodeNames = append(targetNodeNames, taintedNode.Name)
-					klog.Infof("considering node: %q tainted with %q", taintedNode.Name, tnt.String())
+					klog.InfoS("considering node tainted", "node", taintedNode.Name, "taint", tnt.String())
 				})
 
 				AfterEach(func(ctx context.Context) {
@@ -729,7 +729,7 @@ var _ = Describe("[serial][disruptive][rtetols] numaresources RTE tolerations su
 
 				applyTaintToNode(ctx, fxt.Client, taintedNode, tnt)
 				targetNodeNames = append(targetNodeNames, taintedNode.Name)
-				klog.Infof("considering node: %q tainted with %q", taintedNode.Name, tnt.String())
+				klog.InfoS("considering node tainted", "node", taintedNode.Name, "taint", tnt.String())
 
 				By(fmt.Sprintf("waiting for daemonset %v to report correct pods' number", dsKey.String()))
 				updatedDs, err := wait.With(fxt.Client).Interval(time.Second).Timeout(time.Minute).ForDaemonsetPodsCreation(ctx, dsKey, len(workers)-1)
@@ -819,7 +819,7 @@ func isRTEPodFoundOnNode(cli client.Client, ctx context.Context, nodeName string
 		if podLabels["name"] == "resource-topology" {
 			found = true
 			matchingPod = pod
-			klog.Infof("RTE pod is found: %s/%s", pod.Namespace, pod.Name)
+			klog.InfoS("RTE pod is found", "namespace", pod.Namespace, "name", pod.Name)
 			break
 		}
 	}
@@ -930,6 +930,6 @@ func verifyUpdatedMCOnNodes(cli client.Client, ctx context.Context, node corev1.
 		return false, fmt.Errorf("current mc mismatch for node %q", node.Name)
 	}
 
-	klog.Infof("node %q is updated with mc %q", node.Name, desired)
+	klog.InfoS("node is updated with mc", "node", node.Name, "mc", desired)
 	return true, nil
 }

test/e2e/serial/tests/workload_placement_no_nrt.go

@@ -168,14 +168,14 @@ var _ = Describe("[serial] numaresources profile update", Serial, Label("feature
 })
 
 func updateInfoRefreshPause(ctx context.Context, fxt *e2efixture.Fixture, newVal nropv1.InfoRefreshPauseMode, objForKey *nropv1.NUMAResourcesOperator) {
-	klog.Infof("update InfoRefreshPause to %q only if the existing one is different", newVal)
+	klog.InfoS("update InfoRefreshPause only if the existing one is different", "newValue", newVal)
 	nroKey := client.ObjectKeyFromObject(objForKey)
 	currentNrop := &nropv1.NUMAResourcesOperator{}
 	err := fxt.Client.Get(ctx, nroKey, currentNrop)
 	Expect(err).ToNot(HaveOccurred())
 	currentVal := *currentNrop.Status.MachineConfigPools[0].Config.InfoRefreshPause
 	if currentVal == newVal {
-		klog.Infof("profile already has the updated InfoRefreshPause: %s=%s", currentVal, newVal)
+		klog.InfoS("profile already has the updated InfoRefreshPause", "currentValue", currentVal, "newValue", newVal)
 		return
 	}
 
@@ -211,7 +211,7 @@ func updateInfoRefreshPause(ctx context.Context, fxt *e2efixture.Fixture, newVal
 			currentMode = *updatedObj.Status.MachineConfigPools[0].Config.InfoRefreshPause
 		}
 		if currentMode != newVal {
-			klog.Infof("resource status is not updated yet: expected %q found %q", newVal, currentMode)
+			klog.InfoS("resource status is not updated yet", "expected", newVal, "found", currentMode)
 			return false
 		}
 
@@ -223,7 +223,7 @@ func updateInfoRefreshPause(ctx context.Context, fxt *e2efixture.Fixture, newVal
 }
 
 func waitForDaemonSetUpdate(ctx context.Context, fxt *e2efixture.Fixture, dsNsName nropv1.NamespacedName, rtePods []corev1.Pod) {
-	klog.Infof(fmt.Sprintf("ensure old RTE pods of ds %q are deleted", dsNsName))
+	klog.InfoS("ensure old RTE pods of ds are deleted", "daemonset", dsNsName)
 	err := wait.With(fxt.Client).Interval(30*time.Second).Timeout(5*time.Minute).ForPodListAllDeleted(ctx, rtePods)
 	Expect(err).ToNot(HaveOccurred(), "Expected old RTE pods owned by the DaemonSet to be deleted within the timeout")
 

test/e2e/serial/tests/workload_placement_taint.go

@@ -75,15 +75,15 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload placeme
 		if len(nrtCandidates) < 2 {
 			e2efixture.Skipf(fxt, "not enough nodes with 2 NUMA Zones: found %d", len(nrtCandidates))
 		}
-		klog.Infof("Found node with 2 NUMA zones: %d", len(nrtCandidates))
+		klog.InfoS("Found node with 2 NUMA zones", "count", len(nrtCandidates))
 
 		// we're ok with any TM policy as long as the updater can handle it,
 		// we use this as proxy for "there is valid NRT data for at least X nodes
 		nrts = e2enrt.FilterByTopologyManagerPolicy(nrtCandidates, intnrt.SingleNUMANode)
 		if len(nrts) < 2 {
 			e2efixture.Skipf(fxt, "not enough nodes with valid policy - found %d", len(nrts))
 		}
-		klog.Infof("Found node with 2 NUMA zones: %d", len(nrts))
+		klog.InfoS("Found node with 2 NUMA zones", "count", len(nrts))
 
 		// Note that this test, being part of "serial", expects NO OTHER POD being scheduled
 		// in between, so we consider this information current and valid when the It()s run.
@@ -175,7 +175,7 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload placeme
 			targetNodeName, ok := e2efixture.PopNodeName(targetNodeNameSet)
 			Expect(ok).To(BeTrue())
 
-			klog.Infof("target node will be %q", targetNodeName)
+			klog.InfoS("target node will be", "node", targetNodeName)
 
 			var nrtInitial nrtv1alpha2.NodeResourceTopology
 			err := fxt.Client.Get(context.TODO(), client.ObjectKey{Name: targetNodeName}, &nrtInitial)
@@ -291,7 +291,7 @@ func untaintNodes(cli client.Client, taintedNodeNames []string, taint *corev1.Ta
 				return nil
 			}
 
-			klog.Infof("removing taint: %q from node: %q", taint.String(), updatedNode.Name)
+			klog.InfoS("removing taint from node", "taint", taint.String(), "node", updatedNode.Name)
 			err = cli.Update(context.TODO(), updatedNode)
 			if err != nil {
 				return err
@@ -342,12 +342,12 @@ func applyTaintToNode(ctx context.Context, cli client.Client, targetNode *corev1
 			return nil
 		}
 
-		klog.Infof("adding taint: %q to node: %q", tnt.String(), updatedNode.Name)
+		klog.InfoS("adding taint to node", "taint", tnt.String(), "node", updatedNode.Name)
 		err = cli.Update(ctx, updatedNode)
 		if err != nil {
 			return err
 		}
-		klog.Infof("added taint: %q to node: %q", tnt.String(), updatedNode.Name)
+		klog.InfoS("added taint to node", "taint", tnt.String(), "node", updatedNode.Name)
 		return nil
 	}).WithPolling(1 * time.Second).WithTimeout(1 * time.Minute).Should(Succeed())
 	return updatedNode

test/e2e/tools/mkginkgolabelfilter_test.go

@@ -64,7 +64,7 @@ var _ = Describe("[tools][mkginkgolabelfilter] Auxiliary tools", Label("tools",
 			}
 			expectExecutableExists(cmdline[0])
 			for _, tc := range testcases {
-				klog.Infof("running %q\n", tc.name)
+				klog.InfoS("running", "testCase", tc.name)
 				buffer := bytes.Buffer{}
 				toolCmd := exec.Command(cmdline[0])
 				_, err := buffer.Write(append([]byte(tc.input), "\n"...))

test/e2e/uninstall/uninstall_test.go

@@ -76,12 +76,12 @@ var _ = Describe("[Uninstall] clusterCleanup", Serial, func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			if err := e2eclient.Client.Delete(context.TODO(), nroObj); err != nil {
-				klog.Infof("failed to delete the numaresourcesoperators %q", nroObj.Name)
+				klog.InfoS("failed to delete the numaresourcesoperators", "name", nroObj.Name)
 				return
 			}
 
 			if err := e2eclient.Client.Delete(context.TODO(), kcObj); err != nil && !errors.IsNotFound(err) {
-				klog.Infof("failed to delete the kubeletconfigs %q", kcObj.Name)
+				klog.InfoS("failed to delete the kubeletconfigs", "name", kcObj.Name)
 			}
 
 			timeout := configuration.MachineConfigPoolUpdateTimeout   // shortcut
@@ -91,7 +91,7 @@ var _ = Describe("[Uninstall] clusterCleanup", Serial, func() {
 			if configuration.Plat == platform.Kubernetes {
 				mcpObj := objects.TestMCP()
 				if err := e2eclient.Client.Delete(context.TODO(), mcpObj); err != nil {
-					klog.Infof("failed to delete the machine config pool %q", mcpObj.Name)
+					klog.InfoS("failed to delete the machine config pool", "name", mcpObj.Name)
 				}
 			}