From b2be70296f8b76925f7f4f85fb37c2472b815a67 Mon Sep 17 00:00:00 2001 From: hendrikvonkiedrowski Date: Wed, 17 Apr 2024 18:53:40 +0200 Subject: [PATCH 1/2] Bugfix: Ingester zoneAwareReplication --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- .../loki/templates/ingester/statefulset-ingester-zone-b.yaml | 4 ++-- .../loki/templates/ingester/statefulset-ingester-zone-c.yaml | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index b3673def27fef..8584ae50f6d47 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.) +## 6.2.1 + +- [BUGFIX] Fixed Typo in Ingester templates for zoneAwareReplication + ## 6.2.0 - [FEATURE] Add a headless service to the bloom gateway component. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 413444160fa22..cd1abdde0abdb 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: 3.0.0 -version: 6.2.0 +version: 6.2.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml index a0c7b85f8a147..3af81ae6477ef 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml @@ -168,10 +168,10 @@ spec: values: - ingester-zone-b topologyKey: kubernetes.io/hostname - {{- with .Values.ingester.zoneAwareReplication.zoneA.extraAffinity }} + {{- with .Values.ingester.zoneAwareReplication.zoneB.extraAffinity }} {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.ingester.zoneAwareReplication.zoneA.nodeSelector }} + {{- with .Values.ingester.zoneAwareReplication.zoneB.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml index cc65f49b244c5..30393fa4d2cae 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml @@ -168,10 +168,10 @@ spec: values: - ingester-zone-c topologyKey: kubernetes.io/hostname - {{- with .Values.ingester.zoneAwareReplication.zoneA.extraAffinity }} + {{- with .Values.ingester.zoneAwareReplication.zoneC.extraAffinity }} {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.ingester.zoneAwareReplication.zoneA.nodeSelector }} + {{- with .Values.ingester.zoneAwareReplication.zoneC.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} From 4dc536db4c0f97083215312e7606baa592c602f2 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Fri, 19 Apr 2024 16:23:27 +0100 Subject: [PATCH 2/2] Update README as well Signed-off-by: Michel Hollands --- production/helm/loki/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 0a51d7d71cc85..61b7403c7d5af 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.3.0](https://img.shields.io/badge/Version-6.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.3.1](https://img.shields.io/badge/Version-6.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode