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

feat(helm): ✨ add additional service annotations for components in distributed mode #14131

Merged
merged 14 commits into from
Sep 24, 2024
Merged

feat(helm): ✨ add additional service annotations for components in distributed mode #14131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4b79ec1
feat(helm): :sparkles: add additional service annotations for compone…
dannylongeuay Sep 13, 2024
68ad92e
docs(helm): :pencil: update reference and readme
dannylongeuay Sep 13, 2024
9308bf9
Merge branch 'main' into feat-helm-distributed-service-annotations
chaudum Sep 17, 2024
3457553
Merge branch 'main' into feat-helm-distributed-service-annotations
dannylongeuay Sep 18, 2024
ca88065
Merge branch 'main' into feat-helm-distributed-service-annotations
dannylongeuay Sep 20, 2024
f59798b
chore(helm): :wrench: update version to 6.14.0
dannylongeuay Sep 20, 2024
79ca7e4
Merge branch 'main' into feat-helm-distributed-service-annotations
dannylongeuay Sep 23, 2024
d3abf7c
Merge branch 'main' into feat-helm-distributed-service-annotations
chaudum Sep 23, 2024
7dbf6d9
chore(helm): :wrench: update version to 6.14.0 in readme
dannylongeuay Sep 23, 2024
8e4403e
fix(helm): :bug: readme badge version
dannylongeuay Sep 23, 2024
d25dccb
Merge branch 'main' into feat-helm-distributed-service-annotations
dannylongeuay Sep 23, 2024
cce1246
Merge branch 'main' into feat-helm-distributed-service-annotations
dannylongeuay Sep 24, 2024
5e5150d
Merge branch 'main' into feat-helm-distributed-service-annotations
dannylongeuay Sep 24, 2024
f15ac21
Merge branch 'main' into feat-helm-distributed-service-annotations
trevorwhitney Sep 24, 2024
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
120 changes: 120 additions & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,7 @@ null
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -1030,6 +1031,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>bloomBuilder.serviceAnnotations</td>
<td>object</td>
<td>Annotations for bloom-builder service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -1125,6 +1135,7 @@ null
"imagePullSecrets": [],
"name": null
},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -1411,6 +1422,15 @@ true
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
<td>bloomGateway.serviceAnnotations</td>
<td>object</td>
<td>Annotations for bloom-gateway service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -1506,6 +1526,7 @@ null
"imagePullSecrets": [],
"name": null
},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -1792,6 +1813,15 @@ true
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
<td>bloomPlanner.serviceAnnotations</td>
<td>object</td>
<td>Annotations for bloom-planner service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2252,6 +2282,7 @@ null
"imagePullSecrets": [],
"name": null
},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -2547,6 +2578,15 @@ true
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
<td>compactor.serviceAnnotations</td>
<td>object</td>
<td>Annotations for compactor service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2642,6 +2682,7 @@ null
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -2928,6 +2969,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>distributor.serviceAnnotations</td>
<td>object</td>
<td>Annotations for distributor service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -4520,6 +4570,7 @@ null
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 300,
"tolerations": []
Expand Down Expand Up @@ -4770,6 +4821,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>indexGateway.serviceAnnotations</td>
<td>object</td>
<td>Annotations for index-gateway service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -4873,6 +4933,7 @@ null
"readinessProbe": {},
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 300,
"tolerations": [],
Expand Down Expand Up @@ -5253,6 +5314,15 @@ false
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>ingester.serviceAnnotations</td>
<td>object</td>
<td>Annotations for ingestor service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -7457,6 +7527,7 @@ false
"imagePullSecrets": [],
"name": null
},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -7752,6 +7823,15 @@ true
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
<td>patternIngester.serviceAnnotations</td>
<td>object</td>
<td>Annotations for pattern ingester service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -7846,6 +7926,7 @@ null
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": [],
Expand Down Expand Up @@ -8198,6 +8279,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>querier.serviceAnnotations</td>
<td>object</td>
<td>Annotations for querier service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8292,6 +8382,7 @@ Defaults to allow skew no more then 1 node
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -8569,6 +8660,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>queryFrontend.serviceAnnotations</td>
<td>object</td>
<td>Annotations for query-frontend service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8640,6 +8740,7 @@ null
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
Expand Down Expand Up @@ -8818,6 +8919,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>queryScheduler.serviceAnnotations</td>
<td>object</td>
<td>Annotations for query-scheduler service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -9739,6 +9849,7 @@ null
"priorityClassName": null,
"replicas": 0,
"resources": {},
"serviceAnnotations": {},
"serviceLabels": {},
"terminationGracePeriodSeconds": 300,
"tolerations": []
Expand Down Expand Up @@ -9998,6 +10109,15 @@ null
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>ruler.serviceAnnotations</td>
<td>object</td>
<td>Annotations for ruler service</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)

## 6.14.0

- [FEATURE] Add additional service annotations for components in distributed mode

## 6.13.0

- [CHANGE] Correctly wrap ClusterRoleBinding around `rbac/namespaced` conditional.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
type: application
appVersion: 3.1.1
version: 6.13.0
version: 6.14.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.13.0](https://img.shields.io/badge/Version-6.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)
![Version: 6.14.0](https://img.shields.io/badge/Version-6.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Expand Down
9 changes: 6 additions & 3 deletions production/helm/loki/templates/bloom-builder/service-bloom-builder-headless.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
prometheus.io/service-monitor: "false"
{{- with .Values.loki.serviceAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.bloomBuilder.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
spec:
clusterIP: None
type: ClusterIP
Expand Down
9 changes: 6 additions & 3 deletions production/helm/loki/templates/bloom-builder/service-bloom-builder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ metadata:
{{- with .Values.bloomBuilder.serviceLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.bloomBuilder.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
spec:
type: ClusterIP
publishNotReadyAddresses: true
Expand Down
9 changes: 6 additions & 3 deletions production/helm/loki/templates/bloom-gateway/service-bloom-gateway-headless.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ metadata:
{{- with .Values.bloomGateway.serviceLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.bloomGateway.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
spec:
type: ClusterIP
clusterIP: None
Expand Down
9 changes: 6 additions & 3 deletions production/helm/loki/templates/bloom-planner/service-bloom-planner-headless.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ metadata:
{{- with .Values.bloomPlanner.serviceLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.bloomPlanner.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
spec:
type: ClusterIP
clusterIP: None
Expand Down
Loading
Loading