Merge pull request #564 from danielvegamyhre/automated-cherry-pick-of-#562-upstream-release-0.5

k8s-ci-robot · web-flow · commit 43f8137c00bd · 2024-05-08T21:49:21.000-07:00
Automated cherry pick of #562: don't reconcile jobsets with deletion timestamp set
diff --git a/pkg/controllers/jobset_controller.go b/pkg/controllers/jobset_controller.go
@@ -103,6 +103,11 @@ func (r *JobSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
+	// Don't reconcile JobSets marked for deletion.
+	if jobSetMarkedForDeletion(&js) {
+		return ctrl.Result{}, nil
+	}
+
 	// Track JobSet status updates that should be performed at the end of the reconciliation attempt.
 	updateStatusOpts := statusUpdateOpts{}
 
@@ -816,6 +821,10 @@ func jobSetFinished(js *jobset.JobSet) bool {
 	return false
 }
 
+func jobSetMarkedForDeletion(js *jobset.JobSet) bool {
+	return js.DeletionTimestamp != nil
+}
+
 func dnsHostnamesEnabled(js *jobset.JobSet) bool {
 	return js.Spec.Network.EnableDNSHostnames != nil && *js.Spec.Network.EnableDNSHostnames
 }

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,11 @@ func (r *JobSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr`
`103`	`103`	`return ctrl.Result{}, client.IgnoreNotFound(err)`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ // Don't reconcile JobSets marked for deletion.`
	`107`	`+ if jobSetMarkedForDeletion(&js) {`
	`108`	`+ return ctrl.Result{}, nil`
	`109`	`+ }`
	`110`	`+`
`106`	`111`	`// Track JobSet status updates that should be performed at the end of the reconciliation attempt.`
`107`	`112`	`updateStatusOpts := statusUpdateOpts{}`
`108`	`113`
`@@ -816,6 +821,10 @@ func jobSetFinished(js *jobset.JobSet) bool {`
`816`	`821`	`return false`
`817`	`822`	`}`
`818`	`823`
	`824`	`+func jobSetMarkedForDeletion(js *jobset.JobSet) bool {`
	`825`	`+ return js.DeletionTimestamp != nil`
	`826`	`+}`
	`827`	`+`
`819`	`828`	`func dnsHostnamesEnabled(js *jobset.JobSet) bool {`
`820`	`829`	`return js.Spec.Network.EnableDNSHostnames != nil && *js.Spec.Network.EnableDNSHostnames`
`821`	`830`	`}`