Skip to content
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.

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

Split resource and non-resource rules during conversion #14454

Merged
merged 1 commit into from
Jun 3, 2017

Conversation

enj
Copy link
Contributor

@enj enj commented Jun 2, 2017

This changes makes it so that Origin PolicyRules that reference both resources and non-resources are split during conversion to RBAC PolicyRules. RBAC does not allow a rule to specify both and will fail validation in such cases. Since the conversion is unambiguous, we can do it automatically to prevent end users from having to deal with it when we switch over to RBAC.

Signed-off-by: Monis Khan [email protected]

This changes makes it so that Origin PolicyRules that reference both
resources and non-resources are split during conversion to RBAC
PolicyRules.  RBAC does not allow a rule to specify both and will fail
validation in such cases.  Since the conversion is unambiguous, we can
do it automatically to prevent end users from having to deal with it
when we switch over to RBAC.

Signed-off-by: Monis Khan <[email protected]>
@enj enj requested review from liggitt and deads2k June 2, 2017 13:24
@enj
Copy link
Contributor Author

enj commented Jun 2, 2017

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 953471c

@deads2k
Copy link
Contributor

deads2k commented Jun 2, 2017

lgtm

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1907/) (Base Commit: 5f2f3f4)

@enj
Copy link
Contributor Author

enj commented Jun 3, 2017

Confirmed that Jordan was happy with this.

Merging since we need this for 3.6.

[merge][severity: blocker]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 953471c

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 3, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/886/) (Base Commit: dcf2e0c) (Extended Tests: blocker) (Image: devenv-rhel7_6296)

@openshift-bot openshift-bot merged commit 64eccce into openshift:master Jun 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants