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

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

Merged
merged 7 commits into from
Oct 3, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e4f3c7
feat: support prometheus deployment custom annotations
cemenson Sep 14, 2023
7eaf80c
fix: add annotations to pod spec too
cemenson Sep 14, 2023
8491325
chore: add readme
cemenson Sep 14, 2023
bfee081
fix: relocate value to prometheus root
cemenson Sep 14, 2023
7f274c2
fix: only apply annotations to pod and rename values for clarity
cemenson Sep 27, 2023
2797fa6
chore: update readme
cemenson Sep 27, 2023
457adc2
Merge branch 'main' into pr/cemenson/11374
adleong Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions viz/charts/linkerd-viz/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ Kubernetes: `>=1.21.0-0`
| prometheus.logFormat | string | defaultLogLevel | log format (plain, json) of the prometheus instance |
| prometheus.logLevel | string | defaultLogLevel | log level of the prometheus instance |
| prometheus.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information |
| prometheus.podAnnotations | object | `{}` | annotations for the prometheus pod |
| prometheus.proxy | string | `nil` | |
| prometheus.remoteWrite | string | `nil` | Allows transparently sending samples to an endpoint. Mostly used for long term storage. |
| prometheus.resources.cpu.limit | string | `nil` | Maximum amount of CPU units that the prometheus container can use |
Expand Down
1 change: 1 addition & 0 deletions viz/charts/linkerd-viz/templates/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ spec:
{{- include "partials.proxy.config.annotations" .resources | nindent 8 }}
{{- end }}
{{- with .Values.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }}
{{- with .Values.prometheus.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }}
linkerd.io/inject: enabled
config.alpha.linkerd.io/proxy-wait-before-exit-seconds: "0"
labels:
Expand Down
3 changes: 3 additions & 0 deletions viz/charts/linkerd-viz/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,9 @@ prometheus:
scrape_interval: 10s
scrape_timeout: 10s
evaluation_interval: 10s

# -- annotations for the prometheus pod
podAnnotations: {}

# -- Alert relabeling is applied to alerts before they are sent to the
# Alertmanager.
Expand Down
Loading