Prevent cluster queue webhook from panicking for existing resources (#…

…1670)
kubernetes-sigs · Jan 30, 2024 · f2cba29 · f2cba29
1 parent 38cedb1
commit f2cba29
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pkg/webhooks/clusterqueue_webhook.go b/pkg/webhooks/clusterqueue_webhook.go
@@ -140,7 +140,9 @@ func ValidateClusterQueueUpdate(newObj, oldObj *kueue.ClusterQueue) field.ErrorL
 
 func validatePreemption(preemption *kueue.ClusterQueuePreemption, path *field.Path) field.ErrorList {
 	var allErrs field.ErrorList
-	if preemption.ReclaimWithinCohort == kueue.PreemptionPolicyNever && preemption.BorrowWithinCohort.Policy != kueue.BorrowWithinCohortPolicyNever {
+	if preemption.ReclaimWithinCohort == kueue.PreemptionPolicyNever &&
+		preemption.BorrowWithinCohort != nil &&
+		preemption.BorrowWithinCohort.Policy != kueue.BorrowWithinCohortPolicyNever {
 		allErrs = append(allErrs, field.Invalid(path, preemption, "reclaimWithinCohort=Never and borrowWithinCohort.Policy!=Never"))
 	}
 	return allErrs

diff --git a/pkg/webhooks/clusterqueue_webhook_test.go b/pkg/webhooks/clusterqueue_webhook_test.go
@@ -356,6 +356,19 @@ func TestValidateClusterQueue(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "existing cluster queue created with older Kueue version that has a nil borrowWithinCohort field",
+			clusterQueue: &kueue.ClusterQueue{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "cluster-queue",
+				},
+				Spec: kueue.ClusterQueueSpec{
+					Preemption: &kueue.ClusterQueuePreemption{
+						ReclaimWithinCohort: kueue.PreemptionPolicyNever,
+					},
+				},
+			},
+		},
 	}
 
 	for _, tc := range testcases {