jandre/formol
1
1
Fork 0
Code Issues 6 Pull Requests Projects Releases 1 Wiki Activity

Explicitly delete the cronjob

Browse Source
This commit is contained in:
jandre 2021-03-04 20:44:28 +01:00
parent 906dbd7539
commit 3f28749bba
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/backupconfiguration_controller.go
View File

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