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

Helm: Add extraContainers to write pods #11319

Merged
merged 12 commits into from
Dec 1, 2023
Merged

Helm: Add extraContainers to write pods #11319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2cc695d
fix: adding extraContainers to the write
someStrangerFromTheAbyss Nov 24, 2023
326590b
Add contribution to Changelog
someStrangerFromTheAbyss Nov 24, 2023
448ecc8
fix: changing changelog and chart.yaml to represent new version bump
someStrangerFromTheAbyss Nov 24, 2023
204c1ce
Some small correction
someStrangerFromTheAbyss Nov 27, 2023
7b99f14
Merge branch 'main' into add-extraContainer-write
someStrangerFromTheAbyss Nov 27, 2023
3a3f049
Merge branch 'main' into add-extraContainer-write
someStrangerFromTheAbyss Nov 27, 2023
44553d0
bumping version in the README
someStrangerFromTheAbyss Nov 27, 2023
e68aef1
Merge branch 'main' into add-extraContainer-write
someStrangerFromTheAbyss Nov 29, 2023
7dd2f2e
Bump to 5.40 since 5.39 has now been taken
someStrangerFromTheAbyss Nov 29, 2023
0d54829
Merge branch 'main' into add-extraContainer-write
someStrangerFromTheAbyss Nov 29, 2023
fd15b68
Generated reference file
someStrangerFromTheAbyss Nov 30, 2023
7351d19
Merge branch 'main' into add-extraContainer-write
MichelHollands Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

##### Enhancements

* [11319](https://github.com/grafana/loki/pull/11319) **someStrangerFromTheAbyss**: Helm: Add extraContainers to the write pods.
* [11243](https://github.com/grafana/loki/pull/11243) **kavirajk**: Inflight-logging: Add extra metadata to inflight requests logging.
* [11110](https://github.com/grafana/loki/pull/11003) **MichelHollands**: Change the default of the `metrics-namespace` flag to 'loki'.
* [11086](https://github.com/grafana/loki/pull/11086) **kandrew5**: Helm: Allow topologySpreadConstraints
Expand Down
9 changes: 9 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 @@ -4552,6 +4552,15 @@ null
<td><pre lang="json">
[]
</pre>
</td>
</tr>
<tr>
<td>write.extraContainers</td>
<td>list</td>
<td>Containers to add to the write pods</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.)

## 5.40.0

- [CHANGE] Add extraContainers parameter for the write pod

## 5.39.0

- [FEATURE] Add support for adding OpenStack swift container credentials via helm chart
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 in simple, scalable mode
type: application
appVersion: 2.9.2
version: 5.39.0
version: 5.40.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: 5.39.0](https://img.shields.io/badge/Version-5.39.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
![Version: 5.40.0](https://img.shields.io/badge/Version-5.40.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/templates/write/statefulset-write.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.write.resources | nindent 12 }}
{{- with .Values.write.extraContainers }}
{{- toYaml . | nindent 8}}
{{- end }}
{{- with .Values.write.affinity }}
affinity:
{{- tpl . $ | nindent 8 }}
Expand Down
2 changes: 2 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,8 @@ write:
# https://github.com/grafana/loki/blob/main/docs/sources/operations/storage/wal.md#how-to-scale-updown
# -- Init containers to add to the write pods
initContainers: []
# -- Containers to add to the write pods
extraContainers: []
# -- Volume mounts to add to the write pods
extraVolumeMounts: []
# -- Volumes to add to the write pods
Expand Down