Skip to content

Commit

Permalink
Merge pull request RHEcosystemAppEng#77 from tchughesiv/fixMerge
Browse files Browse the repository at this point in the history
fix owned PR merge
  • Loading branch information
jeremyary authored Dec 16, 2021
2 parents df31fad + 5ab1094 commit b94cd5b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions controllers/dbaastenant_authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func (r *DBaaSTenantReconciler) reconcileTenantRbacObjs(ctx context.Context, ten
!reflect.DeepEqual(clusterRolebinding.Subjects, clusterRoleBindingObj.Subjects) {
clusterRoleBindingObj.RoleRef = clusterRolebinding.RoleRef
clusterRoleBindingObj.Subjects = clusterRolebinding.Subjects
if err := r.updateIfOwned(ctx, &tenant, &clusterRoleObj); err != nil {
if err := r.updateIfOwned(ctx, &tenant, &clusterRoleBindingObj); err != nil {
return err
}
}
Expand Down Expand Up @@ -226,7 +226,7 @@ func (r *DBaaSTenantReconciler) reconcileInventoryRbacObjs(ctx context.Context,
!reflect.DeepEqual(rolebinding.Subjects, roleBindingObj.Subjects) {
roleBindingObj.RoleRef = rolebinding.RoleRef
roleBindingObj.Subjects = rolebinding.Subjects
if err := r.updateIfOwned(ctx, &inventory, &roleObj); err != nil {
if err := r.updateIfOwned(ctx, &inventory, &roleBindingObj); err != nil {
return err
}
}
Expand Down

0 comments on commit b94cd5b

Please sign in to comment.