Skip to content

Commit

Permalink
Helm: Fix GrafanaAgent tolerations scope (#10813)
Browse files Browse the repository at this point in the history
**What this PR does / why we need it**:
`monitoring.selfMonitoring.grafanaAgent.tolerations` was evaluated
inside a wrong scope in the `GrafanaAgent` template, thus having no
effect at all.

**Which issue(s) this PR fixes**:
n/a

**Special notes for your reviewer**:
Fixes an issue with my first (ever)
[PR](#10613) that I thought was
rather trivial but somehow turned out not to be. At least, regarding my
inability to correctly count `with` / `end` scope markers... :(

**Checklist**
- [X] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [X] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [X] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)

---------

Co-authored-by: Michel Hollands <[email protected]>
  • Loading branch information
ngc4579 and MichelHollands authored Oct 11, 2023
1 parent be3ca9c commit c182940
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ 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.28.0

- [BUGFIX] Fix GrafanaAgent tolerations scope

## 5.27.0

- [CHANGE] Bump `nginxinc/nginx-unpriviledged` image version to remediate [CVE-2023-4863](https://github.com/advisories/GHSA-j7hp-h8jx-5ppr)

## 5.26.0
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 in simple, scalable mode
type: application
appVersion: 2.9.1
version: 5.27.0
version: 5.28.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: 5.27.0](https://img.shields.io/badge/Version-5.27.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square)
![Version: 5.28.0](https://img.shields.io/badge/Version-5.28.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ spec:
matchLabels:
{{- include "loki.selectorLabels" $ | nindent 8 }}
{{- end }}
{{- end }}
{{- with .tolerations }}
tolerations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}

---

Expand Down

0 comments on commit c182940

Please sign in to comment.