Fix DIC returned reconcile.Result for ImageStream (#2826)

regression introduced in #2700

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
Co-authored-by: Arnon Gilboa <agilboa@redhat.com>

pkg/controller/dataimportcron-controller.go

@@ -394,13 +394,14 @@ func (r *DataImportCronReconciler) update(ctx context.Context, dataImportCron *c
 		return res, err
 	}
 
-	// We use the poller returned reconcile.Result for RequeueAfter if needed
-	// skip if we disabled schedule
+	// Skip if schedule is disabled
 	if isImageStreamSource(dataImportCron) && dataImportCron.Spec.Schedule != "" {
-		res, err := r.pollImageStreamDigest(ctx, dataImportCron)
+		// We use the poll returned reconcile.Result for RequeueAfter if needed
+		pollRes, err := r.pollImageStreamDigest(ctx, dataImportCron)
 		if err != nil {
-			return res, err
+			return pollRes, err
 		}
+		res = pollRes
 	}
 
 	desiredDigest := dataImportCron.Annotations[AnnSourceDesiredDigest]

pkg/controller/dataimportcron-controller_test.go

@@ -614,8 +614,10 @@ var _ = Describe("All DataImportCron Tests", func() {
 			imageStream := newImageStream(imageStreamName)
 			imageStream.Status.Tags = imageStream.Status.Tags[imageStreamTagsFromIndex:]
 			reconciler = createDataImportCronReconciler(cron, imageStream)
-			_, err := reconciler.Reconcile(context.TODO(), cronReq)
+			res, err := reconciler.Reconcile(context.TODO(), cronReq)
 			Expect(err).ToNot(HaveOccurred())
+			Expect(res.Requeue).To(BeTrue())
+			Expect(res.RequeueAfter.Seconds()).To(And(BeNumerically(">", 0), BeNumerically("<=", 60)))
 
 			err = reconciler.client.Get(context.TODO(), cronKey, cron)
 			Expect(err).ToNot(HaveOccurred())