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

Compare commits

base: jandre:6678bc50e1f1b7bdd0745427a8d9f1ac897b4013
Branches Tags
jandre:master
jandre:snapshots
jandre:v1.0.0
jandre:0.2.1
jandre:v0.9.1
jandre:v0.9.0
jandre:v0.8.0
jandre:v0.7.1
..
compare: jandre:d3d81a0e9d709d85d61ba08d6ce99fe3f64c76de
Branches Tags
jandre:master
jandre:snapshots
jandre:v1.0.0
jandre:0.2.1
jandre:v0.9.1
jandre:v0.9.0
jandre:v0.8.0
jandre:v0.7.1

No commits in common. "6678bc50e1f1b7bdd0745427a8d9f1ac897b4013" and "d3d81a0e9d709d85d61ba08d6ce99fe3f64c76de" have entirely different histories.
6678bc50e1 ... d3d81a0e9d

2 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
controllers/backupconfiguration_controller_helpers.go
View File

@ -290,7 +290,7 @@ func (r *BackupConfigurationReconciler) addSidecar(backupConf formolv1alpha1.Bac
// Delete the sidecar role is there is no more sidecar container in the namespace // Delete the sidecar role is there is no more sidecar container in the namespace
func (r *BackupConfigurationReconciler) deleteRBAC() error { func (r *BackupConfigurationReconciler) deleteRBAC() error {
for _, roleBindingName := range []string{FORMOL_BS_CREATOR_ROLEBINDING, FORMOL_SIDECAR_ROLEBINDING} { for _, roleBindingName := range []string{FORMOL_BS_CREATOR_ROLEBINDING, FORMOL_SIDECAR_CLUSTERROLEBINDING} {
roleBinding := rbacv1.RoleBinding{} roleBinding := rbacv1.RoleBinding{}
if err := r.Get(r.Context, client.ObjectKey{ if err := r.Get(r.Context, client.ObjectKey{
Namespace: r.Namespace, Namespace: r.Namespace,
@ -301,7 +301,7 @@ func (r *BackupConfigurationReconciler) deleteRBAC() error {
} }
} }
} }
for _, roleName := range []string{FORMOL_BS_CREATOR_ROLE, FORMOL_SIDECAR_ROLE} { for _, roleName := range []string{FORMOL_BS_CREATOR_ROLE, FORMOL_SIDECAR_CLUSTERROLE} {
role := rbacv1.Role{} role := rbacv1.Role{}
if err := r.Get(r.Context, client.ObjectKey{ if err := r.Get(r.Context, client.ObjectKey{
Namespace: r.Namespace, Namespace: r.Namespace,

2
controllers/backupsession_controller.go
View File

@ -62,9 +62,7 @@ func (r *BackupSessionReconciler) Reconcile(ctx context.Context, req ctrl.Reques
Namespace: backupSession.Spec.Ref.Namespace, Namespace: backupSession.Spec.Ref.Namespace,
Name: backupSession.Spec.Ref.Name, Name: backupSession.Spec.Ref.Name,
}, &backupConf); err != nil { }, &backupConf); err != nil {
if !errors.IsNotFound(err) {
r.Log.Error(err, "unable to get BackupConfiguration") r.Log.Error(err, "unable to get BackupConfiguration")
}
return ctrl.Result{}, err return ctrl.Result{}, err
} }
if !backupSession.ObjectMeta.DeletionTimestamp.IsZero() { if !backupSession.ObjectMeta.DeletionTimestamp.IsZero() {