Skip to content

Commit

Permalink
chore: Allow setting annotations for memberlist and query-scheduler-d…
Browse files Browse the repository at this point in the history
…iscovery services (#14211)

**What this PR does / why we need it**:
Both the memberlist and query-scheduler-discovery services do not provide a way to add annotations.
  • Loading branch information
tabboud authored Sep 26, 2024
1 parent f80d68a commit c899316
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 2 deletions.
9 changes: 9 additions & 0 deletions docs/sources/setup/install/helm/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -6485,6 +6485,15 @@ true
"type": "RollingUpdate"
}
</pre>
</td>
</tr>
<tr>
<td>memberlist.service.annotations</td>
<td>object</td>
<td></td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ 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.15.0

- [ENHANCEMENT] Allow setting annotations for memberlist and query-scheduler-discovery services
## 6.14.1

- [BUGFIX] Fixed Memcached persistence options.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
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.14.1
version: 6.15.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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.14.1](https://img.shields.io/badge/Version-6.14.1-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.15.0](https://img.shields.io/badge/Version-6.15.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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ metadata:
labels:
{{- include "loki.backendSelectorLabels" . | nindent 4 }}
prometheus.io/service-monitor: "false"
annotations:
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.backend.service.annotations }}
{{- toYaml . | nindent 4}}
{{- end }}
spec:
type: ClusterIP
clusterIP: None
Expand Down
7 changes: 7 additions & 0 deletions production/helm/loki/templates/service-memberlist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ metadata:
namespace: {{ $.Release.Namespace }}
labels:
{{- include "loki.labels" . | nindent 4 }}
annotations:
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.memberlist.service.annotations }}
{{- toYaml . | nindent 4}}
{{- end }}
spec:
type: ClusterIP
clusterIP: None
Expand Down
1 change: 1 addition & 0 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ networkPolicy:
memberlist:
service:
publishNotReadyAddresses: false
annotations: {}
######################################################################################################################
#
# adminAPI configuration, enterprise only.
Expand Down

0 comments on commit c899316

Please sign in to comment.