Helm: RBAC generation fixes #1461
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/S
joelanford
added a commit
to joelanford/operator-sdk
that referenced
this pull request
May 21, 2019
joelanford
force-pushed
the
helm-role-gen-fixes
branch
from
4c105e0
to
9d0e3d9
Compare
joelanford
added a commit
to joelanford/operator-sdk
that referenced
this pull request
May 21, 2019
joelanford
force-pushed
the
helm-role-gen-fixes
branch
from
9d0e3d9
to
e7a9c4c
Compare
|
This also needs to be backported to the |
|
Yes, I think we should backport both. I'll make those PRs after I merge this. |
joelanford
added a commit
to joelanford/operator-sdk
that referenced
this pull request
May 21, 2019
* internal/pkg/scaffold/helm/role.go: return on role generation error * internal/pkg/scaffold/helm/role.go: handle OCP k8s versions * hack/tests/e2e-helm.sh: fail on failed RBAC generation * CHANGELOG.md: added lines for fixes from operator-framework#1456 and operator-framework#1461
joelanford
added a commit
that referenced
this pull request
May 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the change:
Motivation for the change:
This is a follow-on to #1456, which fixed a regression in the Helm RBAC rule generation.
In CI, the RBAC rule generation is currently failing and falling back to the default rule set when using the OCP cluster in Travis. In OCP, the kubernetes version number is reported as
1.11+(in minikube and upstream kubernetes, it is reported as1.11). Helm's libraries to generate manifests fail to parse the kubernetes version when it contains the plus sign, so Helm e2e testing has fallen back to the default non-generated rules ever since RBAC generation was added.The reason that the regression made it through CI is that the changes from #1434 affect only the code path for successful RBAC generation. Since that code path is not running in Travis, it was never tested, and the e2e tests continued to pass because the default non-generated RBAC rules are sufficient for the helm chart used in the e2e tests.
This PR fixes the underlying issue with kubernetes version parsing and improves the e2e test so that future regressions in RBAC rule generation are caught more easily.