Add patchStrategy=merge

Author: alculquicondor

apis/kueue/v1beta1/clusterqueue_types.go

@@ -205,7 +205,9 @@ type ClusterQueueStatus struct {
 	// +optional
 	// +listType=map
 	// +listMapKey=type
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	// +patchStrategy=merge
+	// +patchMergeKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
 }
 
 type FlavorUsage struct {

apis/kueue/v1beta1/localqueue_types.go

@@ -47,7 +47,9 @@ type LocalQueueStatus struct {
 	// +optional
 	// +listType=map
 	// +listMapKey=type
-	Conditions []metav1.Condition `json:"conditions:omitempty"`
+	// +patchStrategy=merge
+	// +patchMergeKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
 
 	// flavorUsage are the used quotas, by flavor currently in use by the
 	// workloads assigned to this LocalQueue.

apis/kueue/v1beta1/workload_types.go

@@ -146,7 +146,9 @@ type WorkloadStatus struct {
 	// +optional
 	// +listType=map
 	// +listMapKey=type
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	// +patchStrategy=merge
+	// +patchMergeKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
 
 	// reclaimablePods keeps track of the number pods within a podset for which
 	// the resource reservation is no longer needed.
@@ -159,7 +161,9 @@ type WorkloadStatus struct {
 	// +optional
 	// +listType=map
 	// +listMapKey=type
-	AdmissionChecks []metav1.Condition `json:"admissionChecks,omitempty"`
+	// +patchStrategy=merge
+	// +patchMergeKey=type
+	AdmissionChecks []metav1.Condition `json:"admissionChecks,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
 }
 
 type ReclaimablePod struct {

pkg/controller/jobs/job/job_controller_test.go

@@ -332,6 +332,9 @@ var (
 		cmpopts.SortSlices(func(a, b kueue.Workload) bool {
 			return a.Name < b.Name
 		}),
+		cmpopts.SortSlices(func(a, b metav1.Condition) bool {
+			return a.Type < b.Type
+		}),
 		cmpopts.IgnoreFields(
 			kueue.Workload{}, "TypeMeta", "ObjectMeta.OwnerReferences",
 			"ObjectMeta.Name", "ObjectMeta.ResourceVersion",
@@ -350,7 +353,6 @@ func TestReconciler(t *testing.T) {
 		Image("", nil)
 
 	cases := map[string]struct {
-		focus             bool
 		reconcilerOptions []jobframework.Option
 		job               batchv1.Job
 		wantJob           batchv1.Job
@@ -761,7 +763,6 @@ func TestReconciler(t *testing.T) {
 			},
 		},
 		"when job completes, workload is marked as finished": {
-			focus: true,
 			job: *baseJobWrapper.Clone().
 				Queue("foo").
 				Condition(batchv1.JobCondition{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}).
@@ -819,9 +820,6 @@ func TestReconciler(t *testing.T) {
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
-			if !tc.focus {
-				t.Skip()
-			}
 			ctx, _ := utiltesting.ContextWithLog(t)
 			clientBuilder := utiltesting.NewClientBuilder()
 			if err := SetupIndexes(ctx, utiltesting.AsIndexer(clientBuilder)); err != nil {