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

commands/operator-sdk,pkg/generator: Fix project root function and rbac updates for Ansible Operator #565

Merged
merged 4 commits into from
Oct 3, 2018

Conversation

dymurray
Copy link
Contributor

@dymurray dymurray commented Oct 3, 2018

This fixes a regression introduced in: #561

To determine if we are in the project root I've changed it to look for tmp/build/Dockerfile.

I also changed the rbac files to have Jinja templating for required differences in Ansible Operator RBAC. It sounds like the Jinja can go away when master is rebased on controller-runtime but I could be wrong on that.

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 3, 2018
@openshift-ci-robot
Copy link

Hi @dymurray. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@shawn-hurley shawn-hurley changed the title Fix project root function and rbac updates for Ansible Operator commands/operator-sdk,pkg/generator: Fix project root function and rbac updates for Ansible Operator Oct 3, 2018
Copy link
Member

@shawn-hurley shawn-hurley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to fix a bug that was introduced with changes to the build command.

@hasbro17 @AlexNPavel PTAL

Copy link
Contributor

@AlexNPavel AlexNPavel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. We'll probably need to look at the controller-runtime refactor branch as well. That checks for the existence of ./cmd/manager/main.go (and the location of the dockerfiles changed)

@hasbro17
Copy link
Contributor

hasbro17 commented Oct 3, 2018

Yeah for now let's just make sure the Ansible CLI works on the master branch. Moving the type ansible CLI changes over to the refactor branch shouldn't be too hard.
LGTM.

@AlexNPavel AlexNPavel merged commit 3e37c94 into operator-framework:master Oct 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants