Compare commits

...

2 Commits

Author SHA1 Message Date
f8707d55e5 set default value to suspend field 2021-03-04 20:44:56 +01:00
3f28749bba Explicitly delete the cronjob 2021-03-04 20:44:28 +01:00
2 changed files with 18 additions and 3 deletions

View File

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

View File

@ -242,6 +242,21 @@ 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)
@ -403,8 +418,7 @@ func (r *BackupConfigurationReconciler) deleteExternalResources(backupConf *form
}
}
// TODO: remove the hardcoded "default"
_ = formolrbac.DeleteFormolRBAC(r.Client, "default", backupConf.Namespace)
_ = formolrbac.DeleteBackupSessionCreatorRBAC(r.Client, backupConf.Namespace)
_ = r.deleteCronJob(backupConf)
return nil
}