update requeue parameter

`ctrl.Result{Requeue: true}` is influenced by backing off. We want
to avoid it.

Signed-off-by: Yuji Ito <llamerada.jp@gmail.com>

Author: llamerada-jp

internal/controller/mantlebackup_controller_test.go

@@ -1380,7 +1380,7 @@ var _ = Describe("export and upload", func() {
 			diffFrom:                          diffFrom,
 		})
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ret.Requeue).To(BeTrue())
+		Expect(ret.RequeueAfter).NotTo(BeZero())
 
 		return target
 	}
@@ -1394,7 +1394,7 @@ var _ = Describe("export and upload", func() {
 			diffFrom:                          nil,
 		})
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ret.Requeue).To(BeTrue())
+		Expect(ret.RequeueAfter).NotTo(BeZero())
 	}
 
 	completeJob := func(ctx SpecContext, jobName string) {
@@ -1739,7 +1739,7 @@ var _ = Describe("import", func() {
 			// The first call to reconcileImportJob should create an import Job
 			res, err := mbr.reconcileImportJob(ctx, backup, snapshotTarget, -1)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(res.Requeue).To(BeTrue())
+			Expect(res.RequeueAfter).NotTo(BeZero())
 
 			var importJob batchv1.Job
 			err = k8sClient.Get(ctx, types.NamespacedName{
@@ -1751,7 +1751,7 @@ var _ = Describe("import", func() {
 			// The successive calls should return ctrl.Result{Requeue: true} until the import Job is completed.
 			res, err = mbr.reconcileImportJob(ctx, backup, snapshotTarget, -1)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(res.Requeue).To(BeTrue())
+			Expect(res.RequeueAfter).NotTo(BeZero())
 
 			// Make the import Job completed.
 			completeJob(ctx, importJob.GetNamespace(), importJob.GetName())
@@ -2177,7 +2177,7 @@ var _ = Describe("import", func() {
 
 			result, err := mbr.reconcileZeroOutJob(ctx, backup, &snapshotTarget{})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(result.Requeue).To(BeFalse())
+			Expect(result.RequeueAfter).To(BeZero())
 
 			var pv corev1.PersistentVolume
 			err = k8sClient.Get(ctx, types.NamespacedName{Name: MakeZeroOutPVName(backup)}, &pv)
@@ -2258,7 +2258,7 @@ var _ = Describe("import", func() {
 			// The first call to reconcileZeroOutJob should create a PV, PVC, and Job, and requeue.
 			result, err := mbr.reconcileZeroOutJob(ctx, backup, snapshotTarget)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(result.Requeue).To(BeTrue())
+			Expect(result.RequeueAfter).NotTo(BeZero())
 
 			var pv corev1.PersistentVolume
 			err = k8sClient.Get(ctx, types.NamespacedName{Name: MakeZeroOutPVName(backup), Namespace: nsController}, &pv)
@@ -2325,7 +2325,7 @@ var _ = Describe("import", func() {
 			// A call to reconcileZeroOutJob should NOT requeue after the Job completed
 			result, err = mbr.reconcileZeroOutJob(ctx, backup, snapshotTarget)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(result.Requeue).To(BeFalse())
+			Expect(result.RequeueAfter).To(BeZero())
 		})
 	})
 

internal/controller/suite_test.go

@@ -71,6 +71,9 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
 
+	err = os.Setenv("REQUEUE_RECONCILIATION_AFTER", "10s")
+	Expect(err).NotTo(HaveOccurred())
+
 	By("Setup common resources")
 	resMgr, err = testutil.NewResourceManager(k8sClient)
 	Expect(err).NotTo(HaveOccurred())

internal/controller/util.go

@@ -151,12 +151,12 @@ func IsJobConditionTrue(conditions []batchv1.JobCondition, conditionType batchv1
 
 func requeueReconciliation() ctrl.Result {
 	requeueAfter := os.Getenv("REQUEUE_RECONCILIATION_AFTER")
-	if requeueAfter != "" {
-		duration, err := time.ParseDuration(requeueAfter)
-		if err != nil {
-			panic(fmt.Sprintf("set REQUEUE_RECONCILIATION_AFTER properly: %v", err))
-		}
-		return ctrl.Result{RequeueAfter: duration}
+	if len(requeueAfter) == 0 {
+		panic("You should set REQUEUE_RECONCILIATION_AFTER env var.")
+	}
+	duration, err := time.ParseDuration(requeueAfter)
+	if err != nil {
+		panic(fmt.Sprintf("Set REQUEUE_RECONCILIATION_AFTER properly: %v", err))
 	}
-	return ctrl.Result{Requeue: true}
+	return ctrl.Result{RequeueAfter: duration}
 }

internal/webhook/v1/suite_test.go

@@ -73,6 +73,9 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
 
+	err = os.Setenv("REQUEUE_RECONCILIATION_AFTER", "10s")
+	Expect(err).NotTo(HaveOccurred())
+
 	By("Setup common resources")
 	resMgr, err = testutil.NewResourceManager(k8sClient)
 	Expect(err).NotTo(HaveOccurred())

test/e2e/testdata/values-mantle-primary-template.yaml

@@ -16,7 +16,7 @@ controller:
   #noProxy: localhost,127.0.0.1,10.96.0.0/12
   env:
     - name: REQUEUE_RECONCILIATION_AFTER
-      value: "1s"
+      value: "10s"
   backupTransferPartSize: {BACKUP_TRANSFER_PART_SIZE}
   mtls:
     serverCACertConfigMap: mantle-secondary-ca-crt

test/e2e/testdata/values-mantle-secondary-template.yaml

@@ -13,8 +13,8 @@ controller:
   envSecret: export-data
   gcInterval: 1s
   env:
-    - name: REQUEUE_RECONCILIATION_IMMEDIATELY
-      value: "1"
+    - name: REQUEUE_RECONCILIATION_AFTER
+      value: "10s"
   mtls:
     clientCACertConfigMap: mantle-primary-ca-crt
     serverTLSSecret: cert-mantle-replication