enable empty schedule in dataimportcron

kubevirt · May 10, 2023 · b0f8445 · b0f8445
1 parent 4b2d633
commit b0f8445
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/pkg/apiserver/webhooks/dataimportcron-validate.go b/pkg/apiserver/webhooks/dataimportcron-validate.go
@@ -116,7 +116,7 @@ func (wh *dataImportCronValidatingWebhook) validateDataImportCronSpec(request *a
 		return causes
 	}
 
-	if _, err := cronexpr.Parse(spec.Schedule); err != nil {
+	if _, err := cronexpr.Parse(spec.Schedule); spec.Schedule != "" && err != nil {
 		causes = append(causes, metav1.StatusCause{
 			Type:    metav1.CauseTypeFieldValueInvalid,
 			Message: "Illegal cron schedule",

diff --git a/pkg/apiserver/webhooks/dataimportcron-validate_test.go b/pkg/apiserver/webhooks/dataimportcron-validate_test.go
@@ -121,6 +121,12 @@ var _ = Describe("Validating Webhook", func() {
 			resp := validateDataImportCronCreate(cron)
 			Expect(resp.Allowed).To(BeFalse())
 		})
+		It("should allow DataImportCron with empty cron schedule", func() {
+			cron := newDataImportCron(cdiv1.DataVolumeSourceRegistry{URL: &testRegistryURL})
+			cron.Spec.Schedule = ""
+			resp := validateDataImportCronCreate(cron)
+			Expect(resp.Allowed).To(BeTrue())
+		})
 		It("should reject DataImportCron with illegal ManagedDataSource on create", func() {
 			cron := newDataImportCron(cdiv1.DataVolumeSourceRegistry{URL: &testRegistryURL})
 			cron.Spec.ManagedDataSource = ""

diff --git a/pkg/controller/dataimportcron-controller.go b/pkg/controller/dataimportcron-controller.go
@@ -132,9 +132,13 @@ func (r *DataImportCronReconciler) Reconcile(ctx context.Context, req reconcile.
 	if !shouldReconcile || err != nil {
 		return reconcile.Result{}, err
 	}
-	if err := r.initCron(ctx, dataImportCron); err != nil {
-		return reconcile.Result{}, err
+	// do not use the poller otherwise
+	if dataImportCron.Spec.Schedule != "" {
+		if err := r.initCron(ctx, dataImportCron); err != nil {
+			return reconcile.Result{}, err
+		}
 	}
+
 	return r.update(ctx, dataImportCron)
 }
 
@@ -353,7 +357,8 @@ func (r *DataImportCronReconciler) update(ctx context.Context, dataImportCron *c
 	}
 
 	// We use the poller returned reconcile.Result for RequeueAfter if needed
-	if isImageStreamSource(dataImportCron) {
+	// skip if we disabled schedule
+	if dataImportCron.Spec.Schedule != "" && isImageStreamSource(dataImportCron) {
 		res, err = r.pollImageStreamDigest(ctx, dataImportCron)
 		if err != nil {
 			return res, err

diff --git a/pkg/controller/dataimportcron-controller_test.go b/pkg/controller/dataimportcron-controller_test.go
@@ -310,6 +310,9 @@ var _ = Describe("All DataImportCron Tests", func() {
 
 			verifyCronJobContainerImage("old-image")
 			verifyCronJobContainerImage("new-image")
+
+			cron.Spec.Schedule = ""
+			verifyCronJobContainerImage("old-image")
 		})
 
 		It("Should create DataVolume on AnnSourceDesiredDigest annotation update, and update DataImportCron and DataSource on DataVolume Succeeded", func() {