From d7511343bcdfe77a6213599827ce0093b2949c18 Mon Sep 17 00:00:00 2001
From: thorker <46462404+thorker@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:08:48 +0200
Subject: [PATCH] fix: Fixes read & backend replicas settings (#12828)
Signed-off-by: thorker
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
---
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 | 4 ++--
production/helm/loki/templates/read/statefulset-read.yaml | 4 ++--
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 5d24c009e0f5..dfa5ccb01c3e 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.4.1
+
+- [BUGFIX] Fixes read & backend replicas settings
+
## 6.4.0
- [ENHANCEMENT] Allow extraObject items as multiline strings, allowing for templating field names
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 791a9971242c..faf93f8d14ca 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.4.0
+version: 6.4.1
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 e3cf5f9f7689..da489ea336a9 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
# loki
-![Version: 6.4.0](https://img.shields.io/badge/Version-6.4.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.4.1](https://img.shields.io/badge/Version-6.4.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
diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml
index 3deb4aa6b6c8..f96f0a4d2121 100644
--- a/production/helm/loki/templates/backend/statefulset-backend.yaml
+++ b/production/helm/loki/templates/backend/statefulset-backend.yaml
@@ -19,11 +19,11 @@ metadata:
{{- end }}
{{- end }}
spec:
-{{- if not .Values.write.autoscaling.enabled }}
+{{- if not .Values.backend.autoscaling.enabled }}
{{- if eq .Values.deploymentMode "SingleBinary" }}
replicas: 0
{{- else }}
- replicas: {{ .Values.write.replicas }}
+ replicas: {{ .Values.backend.replicas }}
{{- end }}
{{- end }}
podManagementPolicy: {{ .Values.backend.podManagementPolicy }}
diff --git a/production/helm/loki/templates/read/statefulset-read.yaml b/production/helm/loki/templates/read/statefulset-read.yaml
index 29d79c7d0c78..0a31de4996df 100644
--- a/production/helm/loki/templates/read/statefulset-read.yaml
+++ b/production/helm/loki/templates/read/statefulset-read.yaml
@@ -19,11 +19,11 @@ metadata:
{{- end }}
{{- end }}
spec:
-{{- if not .Values.write.autoscaling.enabled }}
+{{- if not .Values.read.autoscaling.enabled }}
{{- if eq .Values.deploymentMode "SingleBinary" }}
replicas: 0
{{- else }}
- replicas: {{ .Values.write.replicas }}
+ replicas: {{ .Values.read.replicas }}
{{- end }}
{{- end }}
podManagementPolicy: {{ .Values.read.podManagementPolicy }}