api/v1alpha1/backupconfiguration_webhook.go

@@ -44,8 +44,7 @@ func (r *BackupConfiguration) Default() {
 
 	// TODO(user): fill in your defaulting logic.
 	if r.Spec.Suspend == nil {
-		suspend := false
+		r.Spec.Suspend = new(bool)
-		r.Spec.Suspend = &suspend
 	}
 }
 

controllers/backupconfiguration_controller.go

@@ -242,21 +242,6 @@ func (r *BackupConfigurationReconciler) addSidecarContainer(backupConf *formolv1
 	return nil
 }
 
-func (r *BackupConfigurationReconciler) deleteCronJob(backupConf *formolv1alpha1.BackupConfiguration) error {
-	log := r.Log.WithValues("deleteCronJob", backupConf.Name)
-	_ = formolrbac.DeleteFormolRBAC(r.Client, "default", backupConf.Namespace)
-	_ = formolrbac.DeleteBackupSessionCreatorRBAC(r.Client, backupConf.Namespace)
-	cronjob := &kbatch_beta1.CronJob{}
-	if err := r.Get(context.Background(), client.ObjectKey{
-		Namespace: backupConf.Namespace,
-		Name:      "backup-" + backupConf.Name,
-	}, cronjob); err == nil {
-		log.V(0).Info("Deleting cronjob", "cronjob", cronjob.Name)
-		return r.Delete(context.TODO(), cronjob)
-	} else {
-		return err
-	}
-}
 func (r *BackupConfigurationReconciler) addCronJob(backupConf *formolv1alpha1.BackupConfiguration) error {
 	log := r.Log.WithValues("addCronJob", backupConf.Name)
 
@@ -418,7 +403,8 @@ func (r *BackupConfigurationReconciler) deleteExternalResources(backupConf *form
 		}
 	}
 	// TODO: remove the hardcoded "default"
-	_ = r.deleteCronJob(backupConf)
+	_ = formolrbac.DeleteFormolRBAC(r.Client, "default", backupConf.Namespace)
+	_ = formolrbac.DeleteBackupSessionCreatorRBAC(r.Client, backupConf.Namespace)
 	return nil
 }