Compare commits
2 Commits
d3d81a0e9d
...
6678bc50e1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6678bc50e1 | ||
|
|
0175496bb8 |
@ -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_CLUSTERROLEBINDING} {
|
for _, roleBindingName := range []string{FORMOL_BS_CREATOR_ROLEBINDING, FORMOL_SIDECAR_ROLEBINDING} {
|
||||||
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_CLUSTERROLE} {
|
for _, roleName := range []string{FORMOL_BS_CREATOR_ROLE, FORMOL_SIDECAR_ROLE} {
|
||||||
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,
|
||||||
|
|||||||
@ -62,7 +62,9 @@ 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 {
|
||||||
r.Log.Error(err, "unable to get BackupConfiguration")
|
if !errors.IsNotFound(err) {
|
||||||
|
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() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user