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

feat(helm): Allow specifying podAnnotations per deployment #13388

Merged
merged 3 commits into from
Dec 10, 2024

Conversation

mikutas
Copy link
Contributor

@mikutas mikutas commented Nov 25, 2024

Fixes #13389

Values added:

  • destinationController.podAnnotations
    • annotations only for linkerd-destination
  • identity.podAnnotations
    • annotations only for linkerd-identity
  • proxyInjector.podAnnotations
    • annotations only for linkerd-proxy-injector

Each deployment's podAnnotations take precedence over global one by means of mergeOverwrite.

@mikutas mikutas force-pushed the podannotations-per-deploy branch from ae51e39 to d283751 Compare November 25, 2024 10:25
Signed-off-by: Takumi Sue <[email protected]>
@mikutas mikutas force-pushed the podannotations-per-deploy branch from 9ab08e1 to 05bdd7a Compare November 26, 2024 12:43
@mikutas mikutas marked this pull request as ready for review November 26, 2024 13:37
@mikutas mikutas requested a review from a team as a code owner November 26, 2024 13:37
@adleong
Copy link
Member

adleong commented Dec 5, 2024

Thanks, @mikutas!

As we add more and more places in the Linkerd helm chart where users can insert their own customizations that really are unrelated to Linkerd's own function, I worry about the helm charts becoming bloated or inconsistent. This change itself looks good, but, for example, it adds a place to specify pod annotations but not pod labels. What about service labels and annotations? What about other resource types? As you can see, this would balloon out quickly if we wanted to be consistent and thorough.

I see 3 possible paths forward:

  1. We encourage users who need to customize Linkerd's resources in a way that's not related to Linkerd's functioning to use something like kustomize so that we can keep Linkerd's helm charts clean and simple.
  2. We add these values in a consistent way for all control plane resources and both labels and annotations (is there any other metadata that deserves this treatment too?)
  3. We accept this PR (and PRs like it) to support users who want to make these customizations as they come up and acknowledge and accept that this will result in some non-uniformity and bloat in the Linkerd charts.

Let me discuss with the other maintainers and see what they think. In the meantime, please let me know if you have any thoughts about the above.

@adleong
Copy link
Member

adleong commented Dec 10, 2024

Thanks for your patience @mikutas. I've discussed with the other maintainers and we're happy to accept this PR.

@adleong adleong changed the title Allow specifying podAnnotations per deployment feat(helm): Allow specifying podAnnotations per deployment Dec 10, 2024
@adleong adleong merged commit a20fc0b into linkerd:main Dec 10, 2024
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Helm] podAnnotations per deployment
2 participants