fixup cleanupStaleRequests

Signed-off-by: James Munnelly <[email protected]>

Author: munnerz

manager/manager.go

@@ -627,13 +627,12 @@ func (m *Manager) cleanupStaleRequests(ctx context.Context, log logr.Logger, vol
 	if err != nil {
 		return err
 	}
-
-	if len(reqs) < m.maxRequestsPerVolume {
+	if len(reqs) <= m.maxRequestsPerVolume {
 		return nil
 	}
 
 	// start at the end of the slice and work back to maxRequestsPerVolume
-	for i := len(reqs) - 1; i >= m.maxRequestsPerVolume-1; i-- {
+	for i := len(reqs) - 1; i > m.maxRequestsPerVolume-1; i-- {
 		toDelete := reqs[i]
 		if err := m.client.CertmanagerV1().CertificateRequests(toDelete.Namespace).Delete(ctx, toDelete.Name, metav1.DeleteOptions{}); err != nil {
 			if apierrors.IsNotFound(err) {

manager/manager_test.go

@@ -364,25 +364,24 @@ func TestManager_cleanupStaleRequests(t *testing.T) {
 		wantErr     bool
 	}{
 		{
-			name: "maxRequestsPerVolume=1: all stale CSRs should be deleted",
+			name: "maxRequestsPerVolume=1: one stale CSR should be left",
 			objects: []*cmapi.CertificateRequest{
 				cr("cr-1", defaultTestNamespace, "nodeID-1", "volumeID-1"),
 				cr("cr-2", defaultTestNamespace, "nodeID-1", "volumeID-1"),
 			},
-			toBeDeleted: []string{"cr-2", "cr-1"},
+			toBeDeleted: []string{"cr-2"},
 			fields: fields{
 				nodeID:               "nodeID-1",
 				maxRequestsPerVolume: 1,
 			},
 			wantErr: false,
 		},
 		{
-			name: "maxRequestsPerVolume=2: 1 stale CSRs should be left",
+			name: "maxRequestsPerVolume=2: 2 stale CSRs should be left",
 			objects: []*cmapi.CertificateRequest{
 				cr("cr-1", defaultTestNamespace, "nodeID-1", "volumeID-1"),
 				cr("cr-2", defaultTestNamespace, "nodeID-1", "volumeID-1"),
 			},
-			toBeDeleted: []string{"cr-2"},
 			fields: fields{
 				nodeID:               "nodeID-1",
 				maxRequestsPerVolume: 2,