github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-22 06:59:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71564 from liggitt/reconcile-details

Browse Source 
Improve reconcile output to explain what changes are being made
This commit is contained in:
Kubernetes Prow Robot
2019-02-12 18:45:13 -08:00
committed by GitHub
parent 29638dd68f 74ecf8d978
commit ce4fd07b06
3 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/rbac/reconciliation/reconcile_role.go
View File

@@ -194,7 +194,10 @@ func computeReconciledRole(existing, expected RuleOwner, removeExtraPermissions
}
// Compute extra and missing rules
_, result.ExtraRules = validation.Covers(expected.GetRules(), existing.GetRules())
// Don't compute extra permissions if expected and existing roles are both aggregated
if expected.GetAggregationRule() == nil || existing.GetAggregationRule() == nil {
_, result.ExtraRules = validation.Covers(expected.GetRules(), existing.GetRules())
}
_, result.MissingRules = validation.Covers(existing.GetRules(), expected.GetRules())
switch {