From 5132f6d2a76a26d6e3b8b7127094d16eb26e9442 Mon Sep 17 00:00:00 2001 From: Nikki Ashton Date: Fri, 2 Feb 2024 11:07:29 +0100 Subject: [PATCH] Remove trailing tab character in helm templates (#11805) **What this PR does / why we need it**: Remove trailing tab character in helm templates **Which issue(s) this PR fixes**: Fixes #11385 **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [ ] Tests updated - [ ] `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](https://github.com/grafana/loki/commit/d10549e3ece02120974929894ee333d07755d213) - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](https://github.com/grafana/loki/pull/10840/commits/0d4416a4b03739583349934b96f272fb4f685d15) --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- .../helm/loki/templates/backend/statefulset-backend.yaml | 2 +- production/helm/loki/templates/read/statefulset-read.yaml | 2 +- production/helm/loki/templates/single-binary/statefulset.yaml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index f70a5f118300..9a5b2a3cb4f2 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.42.2 + +- [BUGFIX] Remove trailing tab character in statefulset templates + ## 5.42.1 - [BUGFIX] Added missing annotations to loki-read StatefulSet. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 3217cb5988b9..183333ba652f 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.4 -version: 5.42.1 +version: 5.42.2 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 ec53471e5cdc..5b6cbe5a2fa1 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.42.1](https://img.shields.io/badge/Version-5.42.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square) +![Version: 5.42.2](https://img.shields.io/badge/Version-5.42.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml index 0bdef7e8e777..1b1be055f626 100644 --- a/production/helm/loki/templates/backend/statefulset-backend.yaml +++ b/production/helm/loki/templates/backend/statefulset-backend.yaml @@ -263,7 +263,7 @@ spec: {{- end }} {{- if .Values.backend.persistence.volumeClaimsEnabled }} volumeClaimTemplates: - - apiVersion: v1 + - apiVersion: v1 kind: PersistentVolumeClaim metadata: name: data diff --git a/production/helm/loki/templates/read/statefulset-read.yaml b/production/helm/loki/templates/read/statefulset-read.yaml index 2f16179a56c4..eaea4aaecbc2 100644 --- a/production/helm/loki/templates/read/statefulset-read.yaml +++ b/production/helm/loki/templates/read/statefulset-read.yaml @@ -175,7 +175,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} volumeClaimTemplates: - - apiVersion: v1 + - apiVersion: v1 kind: PersistentVolumeClaim metadata: name: data diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml index b74cc60500d6..96c8974b72c2 100644 --- a/production/helm/loki/templates/single-binary/statefulset.yaml +++ b/production/helm/loki/templates/single-binary/statefulset.yaml @@ -176,7 +176,7 @@ spec: {{- end }} {{- if .Values.singleBinary.persistence.enabled }} volumeClaimTemplates: - - apiVersion: v1 + - apiVersion: v1 kind: PersistentVolumeClaim metadata: name: storage