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

[charts] add support for podLabels and podAnnotations to occm and cinder-csi-plugin charts #2533

Conversation

roehlc
Copy link
Contributor

@roehlc roehlc commented Feb 7, 2024

What this PR does / why we need it:

  • feat: add support for defining podLabels and podAnnotations in the openstack-cloud-controller-manager and cinder-csi-plugin charts
  • fix: explain where commonAnnotations are applied in cinder-csi-plugin chart

This may be used to add custom labels and annotations to theses resources. In environments using vault-injector to add the OpenStack credentials to occm and the csi-plugin this is typically used to specify in which pods the secret should be injected. I'd rather not use already implemented commonAnnotations for this, as these will add the annotations not exclusively to the pods but also to the deployment, daemonset and podmonitor where they do not make any sense.

Which issue this PR fixes(if applicable):

  • fixes -

Special notes for reviewers:

  • please let me know if I chose the correct chart versions - I did not find any documentation about the conventions used by the charts in this repo. My interpretation was the following: the minor chart version is in sync with the appVersion which in turn is in sync with the minor k8s release

Release note:

[charts/occm] add support for podLabels and podAnnotations in helm chart
[charts/cinder-csi-plugin] add support for podLabels and podAnnotations in helm chart

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 7, 2024
Copy link

linux-foundation-easycla bot commented Feb 7, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot requested review from kayrus and zetaab February 7, 2024 08:23
@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Feb 7, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @roehlc!

It looks like this is your first PR to kubernetes/cloud-provider-openstack 🎉. 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/cloud-provider-openstack 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 @roehlc. 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 7, 2024
@jichenjc
Copy link
Contributor

jichenjc commented Feb 7, 2024

/ok-to-test
/easy-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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 7, 2024
Copy link
Contributor

@dulek dulek left a comment

Choose a reason for hiding this comment

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

Could we wrap all these into some template functions, so that we don't need to write whole with-toYaml-end? Also a bunch of remarks inline.

charts/cinder-csi-plugin/values.yaml Outdated Show resolved Hide resolved
@roehlc roehlc force-pushed the feat/occm-csi-cinder/podLabels-podAnnotations branch from 0478b3d to 5b4f4a6 Compare February 14, 2024 06:54
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 14, 2024
@roehlc
Copy link
Contributor Author

roehlc commented Feb 14, 2024

Could we wrap all these into some template functions, so that we don't need to write whole with-toYaml-end? Also a bunch of remarks inline.

I added helper templates to remove the need to write "with-toYaml-end" and addressed the remarks inline.

@dulek Would you please take another look?

@roehlc roehlc requested a review from dulek February 14, 2024 07:41
@dulek
Copy link
Contributor

dulek commented Feb 16, 2024

/lgtm

Leaving approval for someone more experienced with Helm.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 16, 2024
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 12, 2024
@k8s-triage-robot
Copy link

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jul 11, 2024
@roehlc roehlc force-pushed the feat/occm-csi-cinder/podLabels-podAnnotations branch from 5b4f4a6 to 0afb2a6 Compare July 22, 2024 11:45
@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 22, 2024
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 24, 2024
@roehlc roehlc reopened this Sep 24, 2024
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 24, 2024
@roehlc roehlc force-pushed the feat/occm-csi-cinder/podLabels-podAnnotations branch from aab731c to aab8c6e Compare October 15, 2024 05:26
@roehlc roehlc force-pushed the feat/occm-csi-cinder/podLabels-podAnnotations branch from aab8c6e to b7fdc05 Compare October 15, 2024 05:38
@roehlc
Copy link
Contributor Author

roehlc commented Oct 15, 2024

@dulek , @kayrus , @zetaab, @jichenjc
Sorry for pinging you again. Unfortunately the PR was closed when I failed to correctly rebase my branch. This also removed the lgtm labels.

Do any of you have bandwidth to take another look at this PR?

As described above I think I implemented all requested changes from the review.
I also added an explanation to the first comment, describing why I think this change might be useful.

@kayrus
Copy link
Contributor

kayrus commented Oct 15, 2024

have you tested this PR in your env? I don't use this chart and it's hard to say whether everything works as expected.

@roehlc
Copy link
Contributor Author

roehlc commented Oct 15, 2024

have you tested this PR in your env? I don't use this chart and it's hard to say whether everything works as expected.

Yes I tested these changes. We are using this in production since I opened this PR.
I wanted to contribute these changes, so we don't have to use our own fork anymore.

@kayrus
Copy link
Contributor

kayrus commented Oct 15, 2024

/lgtm

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

kayrus commented Oct 16, 2024

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kayrus

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 Oct 16, 2024
@k8s-ci-robot k8s-ci-robot merged commit 04bd8e1 into kubernetes:master Oct 16, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

6 participants