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.

Sign up for GitHub

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

Jump to bottom

Chart: Make admission webhook patch job RBAC configurable. #11376

Merged
merged 10 commits into from
Jun 3, 2024
Merged

Chart: Make admission webhook patch job RBAC configurable. #11376

merged 10 commits into from
Jun 3, 2024

Conversation

rgaduput
Copy link
Contributor

@rgaduput rgaduput commented May 22, 2024 •
edited
Loading

What this PR does / why we need it:

The PR adds support to be able to skip the rbac resources creation in helm chart for admission-webhooks. This is needed when deploying in cluster with restricted permissions.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

fixes #11375

How Has This Been Tested?

Using helm template tested both scenarios rbac creation and skip.

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot requested a review from cpanato May 22, 2024 11:58
@k8s-ci-robot k8s-ci-robot added the area/helm Issues or PRs related to helm charts label May 22, 2024
@linux-foundation-easycla Linux Foundation: EasyCLA
Copy link

linux-foundation-easycla bot commented May 22, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 22, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @rgaduput!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @rgaduput. Thanks for your PR.

I'm waiting for a kubernetes 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.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 22, 2024
@netlify Netlify
Copy link

netlify bot commented May 22, 2024 •
edited
Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 07393fc
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/665d77cc964d9d000809b724

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 22, 2024
@Gacko
Copy link
Member

Gacko commented May 28, 2024

/hold
/assign
/retitle Chart: Make admission webhook patch job RBAC optional.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 28, 2024
@k8s-ci-robot k8s-ci-robot changed the title Add an option to skip rbac resources creation in helm chart for admission-webhooks Chart: Make admission webhook patch job RBAC optional. May 28, 2024
@Gacko
Copy link
Member

Gacko commented May 28, 2024

/triage accepted
/kind feature
/priority backlog

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. kind/feature Categorizes issue or PR as related to a new feature. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels May 28, 2024
Gacko
Gacko reviewed May 28, 2024
View reviewed changes
Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

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

Overall a good job, thank you!

Some thoughts: What do you think about also adding this flag to the PodSecurityPolicy (I know, it's deprecated) and the ServiceAccount? At least the latter would be useful and I think this also is how other charts are doing it.

Since the PSP is a more technical and application specific thing, it's probably safe to be always provided by us and just do the real RBAC components manually by disabling the chart provided RBAC.

Also we would highly appreciate some unit tests in the tests/ directory. Do not hesitate to ask for support!

charts/ingress-nginx/values.yaml Outdated Show resolved Hide resolved
@Gacko
Copy link
Member

Gacko commented May 28, 2024

To clarify my comment: Adding this flag to PSP is really optional. I do not have a strong opinion on this and instead rely on yours.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 29, 2024
@rgaduput
Copy link
Contributor Author

To clarify my comment: Adding this flag to PSP is really optional. I do not have a strong opinion on this and instead rely on yours.

@Gacko I see that PSP resource already has condition mentioned, so I guess its ok.
https://github.com/kubernetes/ingress-nginx/blob/main/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml#L2

@rgaduput
Copy link
Contributor Author

Overall a good job, thank you!

Some thoughts: What do you think about also adding this flag to the PodSecurityPolicy (I know, it's deprecated) and the ServiceAccount? At least the latter would be useful and I think this also is how other charts are doing it.

Since the PSP is a more technical and application specific thing, it's probably safe to be always provided by us and just do the real RBAC components manually by disabling the chart provided RBAC.

Also we would highly appreciate some unit tests in the tests/ directory. Do not hesitate to ask for support!

@Gacko Thanks for the suggestions.
I have implemented options for ServiceAccount.
Added some tests (not an expert on these feel free to comment if its not right).

@rgaduput rgaduput requested a review from Gacko May 29, 2024 07:57
Gacko
Gacko requested changes May 31, 2024
View reviewed changes
Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

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

Left "some" suggestions. I think the general direction is clear. 😬

charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/tests/admission-webhooks/admission-webhooks-service-account_test.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/values.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/values.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/values.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/values.yaml Outdated Show resolved Hide resolved
@Gacko
Copy link
Member

Gacko commented May 31, 2024

/retitle Chart: Make admission webhook patch job RBAC configurable.

@k8s-ci-robot k8s-ci-robot changed the title Chart: Make admission webhook patch job RBAC optional. Chart: Make admission webhook patch job RBAC configurable. May 31, 2024
@rgaduput rgaduput requested a review from Gacko June 2, 2024 10:30
Gacko
Gacko requested changes Jun 2, 2024
View reviewed changes
Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

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

Just some last changes, but looks pretty good apart from that! Gonna LGTM as soon as you applied those. 🙂

charts/ingress-nginx/tests/admission-webhooks/job-patch/clusterrole_test.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/tests/admission-webhooks/job-patch/clusterrolebinding_test.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/tests/admission-webhooks/job-patch/role_test.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/tests/admission-webhooks/job-patch/rolebinding_test.yaml Outdated Show resolved Hide resolved
charts/ingress-nginx/tests/admission-webhooks/job-patch/serviceaccount_test.yaml Outdated Show resolved Hide resolved
rgaduput and others added 5 commits June 3, 2024 13:28
@rgaduput rgaduput requested a review from Gacko June 3, 2024 07:59
Gacko
Gacko approved these changes Jun 3, 2024
View reviewed changes
Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Gacko, rgaduput

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2024
@Gacko
Copy link
Member

Gacko commented Jun 3, 2024

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2024
@k8s-ci-robot k8s-ci-robot merged commit 0c17748 into kubernetes:main Jun 3, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gacko Gacko Gacko approved these changes

@cpanato cpanato Awaiting requested review from cpanato

@ubergesundheit ubergesundheit Awaiting requested review from ubergesundheit

Assignees

@Gacko Gacko

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/helm Issues or PRs related to helm charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Option to skip the rbac creation in admission-webhooks
3 participants
@rgaduput @k8s-ci-robot @Gacko