Merge pull request #564 from danielvegamyhre/automated-cherry-pick-of…

…-#562-upstream-release-0.5

Automated cherry pick of #562: don't reconcile jobsets with deletion timestamp set

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
 }