Update after code review

Author: mszadkow

pkg/controller/jobs/pod/pod_multikueue_adapter.go

@@ -167,13 +167,10 @@ func syncLocalPodWithRemote(
 		}
 
 		// Patch the status of the local pod to match the remote pod
-		if err := clientutil.PatchStatus(ctx, localClient, localPod, func() (bool, error) {
+		return clientutil.PatchStatus(ctx, localClient, localPod, func() (bool, error) {
 			localPod.Status = remotePod.Status
 			return true, nil
-		}); err != nil {
-			return err
-		}
-		return nil
+		})
 	}
 
 	// If the remote pod does not exist, create it

test/e2e/multikueue/e2e_test.go

@@ -423,38 +423,12 @@ var _ = ginkgo.Describe("MultiKueue", func() {
 					}, util.Timeout, util.Interval).Should(gomega.Succeed())
 				})
 			})
-			finishReason := "PodCompleted"
-			finishPodConditions := []corev1.PodCondition{
-				{
-					Type:   corev1.PodReadyToStartContainers,
-					Status: corev1.ConditionFalse,
-					Reason: "",
-				},
-				{
-					Type:   corev1.PodInitialized,
-					Status: corev1.ConditionTrue,
-					Reason: finishReason},
-				{
-					Type:   corev1.PodReady,
-					Status: corev1.ConditionFalse,
-					Reason: finishReason,
-				},
-				{
-					Type:   corev1.ContainersReady,
-					Status: corev1.ConditionFalse,
-					Reason: finishReason},
-				{
-					Type:   corev1.PodScheduled,
-					Status: corev1.ConditionTrue,
-					Reason: "",
-				},
-			}
+
 			ginkgo.By("Waiting for the group to get status updates", func() {
 				gomega.Eventually(func(g gomega.Gomega) {
 					g.Expect(k8sManagerClient.List(ctx, pods, client.InNamespace(managerNs.Name))).To(gomega.Succeed())
 					for _, p := range pods.Items {
 						g.Expect(p.Status.Phase).To(gomega.Equal(corev1.PodSucceeded))
-						g.Expect(p.Status.Conditions).To(gomega.BeComparableTo(finishPodConditions, cmpopts.IgnoreFields(corev1.PodCondition{}, "LastTransitionTime")))
 					}
 				}, util.LongTimeout, util.Interval).Should(gomega.Succeed())
 			})

test/integration/multikueue/jobs_test.go

@@ -1129,17 +1129,10 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 
 			gomega.Eventually(func(g gomega.Gomega) {
 				g.Expect(managerTestCluster.client.Get(managerTestCluster.ctx, wlLookupKey, createdWorkload)).To(gomega.Succeed())
-				acs := workload.FindAdmissionCheck(createdWorkload.Status.AdmissionChecks, multikueueAC.Name)
+				acs := workload.FindAdmissionCheck(createdWorkload.Status.AdmissionChecks, multiKueueAC.Name)
 				g.Expect(acs).NotTo(gomega.BeNil())
 				g.Expect(acs.State).To(gomega.Equal(kueue.CheckStatePending))
 				g.Expect(acs.Message).To(gomega.Equal(`The workload got reservation on "worker1"`))
-				ok, err := utiltesting.HasEventAppeared(managerTestCluster.ctx, managerTestCluster.client, corev1.Event{
-					Reason:  "MultiKueue",
-					Type:    corev1.EventTypeNormal,
-					Message: `The workload got reservation on "worker1"`,
-				})
-				g.Expect(err).NotTo(gomega.HaveOccurred())
-				g.Expect(ok).To(gomega.BeTrue())
 			}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
 			gomega.Eventually(func(g gomega.Gomega) {
@@ -1160,39 +1153,29 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
 					createdPod.Status.Phase = corev1.PodSucceeded
 					createdPod.Status.Conditions = append(createdPod.Status.Conditions,
 						corev1.PodCondition{
-							Type:               corev1.PodReadyToStartContainers,
-							Status:             corev1.ConditionFalse,
-							LastProbeTime:      metav1.Now(),
-							LastTransitionTime: metav1.Now(),
-							Reason:             "",
+							Type:   corev1.PodReadyToStartContainers,
+							Status: corev1.ConditionFalse,
+							Reason: "",
 						},
 						corev1.PodCondition{
-							Type:               corev1.PodInitialized,
-							Status:             corev1.ConditionTrue,
-							LastProbeTime:      metav1.Now(),
-							LastTransitionTime: metav1.Now(),
-							Reason:             string(corev1.PodSucceeded),
+							Type:   corev1.PodInitialized,
+							Status: corev1.ConditionTrue,
+							Reason: string(corev1.PodSucceeded),
 						},
 						corev1.PodCondition{
-							Type:               corev1.PodReady,
-							Status:             corev1.ConditionFalse,
-							LastProbeTime:      metav1.Now(),
-							LastTransitionTime: metav1.Now(),
-							Reason:             string(corev1.PodSucceeded),
+							Type:   corev1.PodReady,
+							Status: corev1.ConditionFalse,
+							Reason: string(corev1.PodSucceeded),
 						},
 						corev1.PodCondition{
-							Type:               corev1.ContainersReady,
-							Status:             corev1.ConditionFalse,
-							LastProbeTime:      metav1.Now(),
-							LastTransitionTime: metav1.Now(),
-							Reason:             string(corev1.PodSucceeded),
+							Type:   corev1.ContainersReady,
+							Status: corev1.ConditionFalse,
+							Reason: string(corev1.PodSucceeded),
 						},
 						corev1.PodCondition{
-							Type:               corev1.PodScheduled,
-							Status:             corev1.ConditionTrue,
-							LastProbeTime:      metav1.Now(),
-							LastTransitionTime: metav1.Now(),
-							Reason:             "",
+							Type:   corev1.PodScheduled,
+							Status: corev1.ConditionTrue,
+							Reason: "",
 						},
 					)
 					g.Expect(worker1TestCluster.client.Status().Update(worker1TestCluster.ctx, &createdPod)).To(gomega.Succeed())