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

Support for Custom Annotations on Linkerd-Viz Prometheus Deployment #11365

Closed
cemenson opened this issue Sep 13, 2023 · 2 comments · Fixed by #11374
Closed

Support for Custom Annotations on Linkerd-Viz Prometheus Deployment #11365

cemenson opened this issue Sep 13, 2023 · 2 comments · Fixed by #11374

Comments

@cemenson
Copy link
Contributor

What problem are you trying to solve?

It would be helpful to be able to specify additional custom Kubernetes annotations for the prometheus deployment within the linkerd-viz helm chart.

Currently, there is no direct way to do this (i.e. can't use --set or a values.yaml).

How should the problem be solved?

Just add a small include on the annotations spec for the prometheus deployment with a default empty object on the values.yaml that can be overwritten.

Any alternatives you've considered?

Only forking this repo to make the change.

How would users interact with this feature?

By default nothing will change for users, but if they so wish they can specify additional annotations via a --set or values.yaml file.

Would you like to work on this feature?

maybe

@hawkw
Copy link
Contributor

hawkw commented Sep 13, 2023

@cemenson I think that if this approach is a conventional idiom for adding annotations to objects created by a Helm chart, we would accept a PR adding it!

@cemenson
Copy link
Contributor Author

@hawkw I've opened a PR for this - just needs a couple of reviews?

adleong added a commit that referenced this issue Oct 3, 2023
…11374)

Support for Custom Annotations on Linkerd-Viz Prometheus Deployment

Currently, adding custom annotations to the prometheus deployment isn't supported. This can't be done either with `--set` helm flag or by adding relevant config to `values.yaml`.

By adding additional helm values by way of a `with` keyword within the prometheus deployment yaml, we can support custom annotations. Setting the value of the reverenced value (`.Values.prometheusAnnotations`) to empty will ensure this doesn't break or modify any existing deployments.

Once merged, setting `prometheusAnnotations` in the `values.yaml` or via a `--set` helm flag will result in specified annotations being included in the prometheus deployment and pod spec.

Fixes #11365

I agree to the DCO for all the commits in this PR.

Co-authored-by: Alex Leong <[email protected]>
@adleong adleong mentioned this issue Oct 4, 2023
adleong added a commit that referenced this issue Oct 4, 2023
This edge release adds additional configurability to Linkerd's viz and
multicluster extensions.

* Added a `podAnnotations` Helm value to allow adding additional annotations to
  the Linkerd-Viz Prometheus Deployment ([#11365]) (thanks @cemenson)
* Added `imagePullSecrets` Helm values to the multicluster chart so that it can
  be installed in an air-gapped environment. ([#11285]) (thanks @lhaussknecht)

[#11365]: #11365
[#11285]: #11285

Signed-off-by: Alex Leong <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants