Skip to content

lib/resourcemerge/rbac: Reconcile ClusterRole.AggregationRule #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 8, 2021
Merged

lib/resourcemerge/rbac: Reconcile ClusterRole.AggregationRule #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/resourcemerge/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ func EnsureClusterRole(modified *bool, existing *rbacv1.ClusterRole, required rb
*modified = true
existing.Rules = required.Rules
}
if !equality.Semantic.DeepEqual(existing.AggregationRule, required.AggregationRule) {
*modified = true
existing.AggregationRule = required.AggregationRule
}
}

// EnsureRoleBinding ensures that the existing matches the required.
Expand Down
4 changes: 4 additions & 0 deletions lib/resourcemerge/rbacv1beta1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ func EnsureClusterRolev1beta1(modified *bool, existing *rbacv1beta1.ClusterRole,
*modified = true
existing.Rules = required.Rules
}
if !equality.Semantic.DeepEqual(existing.AggregationRule, required.AggregationRule) {
*modified = true
existing.AggregationRule = required.AggregationRule
}
}

// EnsureRoleBindingv1beta1 ensures that the existing matches the required.
Expand Down