Merge pull request #137243 from michaelasp/fixJobClear

Fix clearing job consistency store for all deletes

pkg/controller/job/job_controller.go

@@ -601,6 +601,10 @@ func (jm *Controller) deleteJob(logger klog.Logger, obj interface{}) {
 			return
 		}
 	}
+	jm.consistencyStore.Clear(types.NamespacedName{
+		Namespace: jobObj.Namespace,
+		Name:      jobObj.Name,
+	}, jobObj.UID)
 	jm.finishedJobExpectations.Delete(jobObj.UID)
 	jm.enqueueLabelSelector(jobObj)
 
@@ -929,6 +933,10 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (rErr error) {
 			// re-syncing here as the record has to be removed for finished/deleted jobs
 			return fmt.Errorf("error removing backoff record %w", err)
 		}
+		jm.consistencyStore.Clear(types.NamespacedName{
+			Namespace: job.Namespace,
+			Name:      job.Name,
+		}, job.UID)
 		jm.finishedJobExpectations.Delete(job.UID)
 		return nil
 	}