Merge pull request #111721 from alculquicondor/fix-delete-expectations

Fix deleting UIDs tracking expectations
kubernetes · Aug 5, 2022 · 1374391 · 1374391
2 parents 11d4cb5 + c1e0dac
commit 1374391
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/controller/job/tracking_utils.go b/pkg/controller/job/tracking_utils.go
@@ -105,8 +105,11 @@ func (u *uidTrackingExpectations) finalizerRemovalObserved(jobKey, deleteKey str
 
 // DeleteExpectations deletes the UID set.
 func (u *uidTrackingExpectations) deleteExpectations(jobKey string) {
-	if err := u.store.Delete(jobKey); err != nil {
-		klog.ErrorS(err, "deleting tracking annotation UID expectations", "job", jobKey)
+	set := u.getSet(jobKey)
+	if set != nil {
+		if err := u.store.Delete(set); err != nil {
+			klog.ErrorS(err, "Could not delete tracking annotation UID expectations", "job", jobKey)
+		}
 	}
 }
 

diff --git a/pkg/controller/job/tracking_utils_test.go b/pkg/controller/job/tracking_utils_test.go
@@ -108,4 +108,11 @@ func TestUIDTrackingExpectations(t *testing.T) {
 			t.Errorf("Unexpected keys for job %s (-want,+got):\n%s", track.job, diff)
 		}
 	}
+	for _, track := range tracks {
+		expectations.deleteExpectations(track.job)
+		uids := expectations.getSet(track.job)
+		if uids != nil {
+			t.Errorf("Wanted expectations for job %s to be cleared, but they were not", track.job)
+		}
+	}
 }