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

Cherry-pick the ability to disable clusterrole aggregation #63

Merged
merged 1 commit into from
Sep 28, 2022

Conversation

muvaf
Copy link
Contributor

@muvaf muvaf commented Sep 28, 2022

Description of your changes

Cherry pick of crossplane/crossplane#3343 . This targets only the release-1.9 branch since it's needed for EKS Addon compatibility and we'll publish only v1.9 and above there. No impact on existing users.

I have:

  • Read and followed Crossplane's contribution process.
  • Run make reviewable to ensure this PR is ready for review.
  • Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Tested in upstream PR, manually by installing the Helm chart and confirming that the changes are effective and existing users are not affected.

Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

@muvaf this looks good to me, though I have typically been fast-forwarding master in this repo, then CP'ing the exact commit back to release branches. Since this is a divergence anyway, it doesn't matter too much, but does help us avoid having release branches "ahead" of master, which is tracking upstream 👍🏻

@muvaf
Copy link
Contributor Author

muvaf commented Sep 28, 2022

@hasheddan That sounds nicer. Let's do it #64

… deployed

Signed-off-by: Muvaffak Onus <me@muvaf.com>
@muvaf muvaf merged commit 99b2bf8 into upbound:release-1.9 Sep 28, 2022
@muvaf muvaf deleted the sync-upstream-release-1.9 branch September 28, 2022 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants