From 7a69ed295fb7283b4757c5a19eb3cd6eaff1beab Mon Sep 17 00:00:00 2001 From: risson <18313093+rissson@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:18:22 +0200 Subject: [PATCH] helm: fix singleBinary missing anotations (#10605) **Which issue(s) this PR fixes**: Fixes #10528 **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] N/A: Documentation added - [x] N/A: Tests updated - [x] `CHANGELOG.md` updated - [x] N/A: If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [x] 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](https://github.com/grafana/loki/commit/d10549e3ece02120974929894ee333d07755d213) Signed-off-by: Marc 'risson' Schmitt --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- production/helm/loki/templates/single-binary/statefulset.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index df7f0cfadf75a..9495ed16535db 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : 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.34.0 + +- [BUGFIX] Fix missing annotations when using Loki in single binary mode. + ## 5.33.0 - [CHANGE] Changed version of Grafana Enterprise Logs to v1.8.4 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 7259904b23e05..6f4a671f933be 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.9.2 -version: 5.33.0 +version: 5.34.0 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 631792a078fe5..5c5d6391744ea 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.33.0](https://img.shields.io/badge/Version-5.33.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.34.0](https://img.shields.io/badge/Version-5.34.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 diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml index d19689e399b07..b74cc60500d6a 100644 --- a/production/helm/loki/templates/single-binary/statefulset.yaml +++ b/production/helm/loki/templates/single-binary/statefulset.yaml @@ -9,7 +9,7 @@ metadata: labels: {{- include "loki.singleBinaryLabels" . | nindent 4 }} app.kubernetes.io/part-of: memberlist - {{- if or (not (empty .Values.loki.annotations)) (not (empty .Values.backend.annotations))}} + {{- if or (not (empty .Values.loki.annotations)) (not (empty .Values.singleBinary.annotations))}} annotations: {{- with .Values.loki.annotations }} {{- toYaml . | nindent 4 }}