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

Helm chart: make more fields configurable for the deployment, daemonset and storage class #406

Merged
merged 1 commit into from
May 25, 2021
Merged

Helm chart: make more fields configurable for the deployment, daemonset and storage class #406

merged 1 commit into from
May 25, 2021

Conversation

MaesterZ
Copy link
Contributor

@MaesterZ MaesterZ commented Apr 7, 2021 •
edited
Loading

Helm chart

Is this a bug fix or adding new feature?

Start of my work: pod annotations not being specific to the Controller deployment or the Node daemonset (bug)
==> new feature: make everything properly configurable

What is this PR about? / Why do we need it?

We should be able to set annotations, resources, nodeSelector, tolerations, affinity, etc. specifically. Improvement from #398 not fully addressing these issues.

I tried to find an elegant solution to this issue but it's very hard not to create breaking changes in the Helm values file.

What testing is done?

Tested in AWS EKS 1.19.6 with Helm 3.5.3

What else?

I added a changelog for the Helm chart, could be useful.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 7, 2021
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 7, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @Misteur-Z!

It looks like this is your first PR to kubernetes-sigs/aws-efs-csi-driver 🎉. 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-sigs/aws-efs-csi-driver 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 @Misteur-Z. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 7, 2021
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 7, 2021
@MaesterZ MaesterZ changed the title Fix podAnnotations, make it possible to set resources for all containers Helm chart: fix podAnnotations, make it possible to set resources for all containers Apr 7, 2021
@MaesterZ MaesterZ marked this pull request as ready for review April 7, 2021 14:41
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 7, 2021
@MaesterZ MaesterZ changed the title Helm chart: fix podAnnotations, make it possible to set resources for all containers Helm chart: make more fields configurable for the deployment, daemonset and storage class Apr 7, 2021
@fkrestan fkrestan mentioned this pull request Apr 13, 2021
Closed
@wongma7
Copy link
Contributor

wongma7 commented Apr 14, 2021

/ok-to-test
/check-cla

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 14, 2021
@wongma7
Copy link
Contributor

wongma7 commented Apr 14, 2021

Heads up, you might have to do some rebasing, I might merge a bunch of 1.2.x changes first in the next few days, however in principle I approve of this PR.

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 15, 2021
@MaesterZ
Copy link
Contributor Author

  • Seems good to go, tested the Chart again in EKS
  • I didn't update the Helm chart changelog all the way to version 1.0.0

@wongma7 wongma7 mentioned this pull request Apr 21, 2021
Closed
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 22, 2021
@MaesterZ
Copy link
Contributor Author

Merged master again:

  • fixed logLevel not being specific to either the controller deployment or node daemonset
  • moved serviceAccount into controller since it's specific to its deployment

@wongma7
Copy link
Contributor

wongma7 commented Apr 28, 2021

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 28, 2021
@MaesterZ
Copy link
Contributor Author

Addressed most comments but there is still some questions left.

  • Normalized from . | toYaml to toYaml . everywhere
  • Normalized from if to with when relevant

@MaesterZ
Copy link
Contributor Author

MaesterZ commented May 3, 2021

Feels good to go @krmichel, not sure if there is anything to fix in deploy/ or elsewhere @wongma7

@krmichel
Copy link
Contributor

krmichel commented May 3, 2021

Feels good to go @krmichel, not sure if there is anything to fix in deploy/ or elsewhere @wongma7

I think it looks pretty good except dealing with the daemonset tolerations. Once that is addressed I should be good with it.

krmichel
krmichel approved these changes May 3, 2021
View reviewed changes
Copy link
Contributor

@krmichel krmichel left a comment

Choose a reason for hiding this comment

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

looks good

@MaesterZ
Copy link
Contributor Author

Not sure what's next, should we merge this?

@wongma7
Copy link
Contributor

wongma7 commented May 11, 2021

/hold cancel

Sorry Ive been quite busy for last 2 weeks but will do final pass and merge soon

@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 May 11, 2021
@retraut retraut mentioned this pull request May 20, 2021
Closed
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 21, 2021
@wongma7
Copy link
Contributor

wongma7 commented May 24, 2021

/approve

thank you very much. Appreciate the patience, reviewer bandwidth is quite low... do you mind squashing the commits into one or two? using git rebase -i or something similar. It will make it easier to backport to release-1.2 branch ( which to be fair I am not 100% sure we should do yet). Merging this PR WON'T immediately release the 2.0.0 chart, somebody still needs to do some manual stuff to release the chart.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: krmichel, Misteur-Z, wongma7

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 May 24, 2021
@MaesterZ
Copy link
Contributor Author

Squashed into a single commit

@wongma7
Copy link
Contributor

wongma7 commented May 25, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 25, 2021
@k8s-ci-robot k8s-ci-robot merged commit cc56c4c into kubernetes-sigs:master May 25, 2021
@MaksymDolgykh MaksymDolgykh mentioned this pull request May 26, 2021
Closed
@rmgpinto
Copy link

@wongma7 can you release the 2.0.0 chart?
Thanks

@wongma7 wongma7 mentioned this pull request May 27, 2021
Merged
@wongma7
Copy link
Contributor

wongma7 commented May 27, 2021

@rmgpinto it's coming #458

@MaesterZ MaesterZ deleted the annotations branch May 27, 2021 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wongma7 wongma7 wongma7 left review comments

@ayberk ayberk ayberk requested changes

@krmichel krmichel krmichel approved these changes

@justinsb justinsb Awaiting requested review from justinsb

@nckturner nckturner Awaiting requested review from nckturner

Assignees

@wongma7 wongma7

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MaesterZ @k8s-ci-robot @wongma7 @krmichel @rmgpinto @ayberk