From 2c46aa8f28fa961ce05cc72c88ad40e42c09413c Mon Sep 17 00:00:00 2001 From: Bryan SebaRaj Date: Fri, 29 Aug 2025 21:19:19 -0400 Subject: [PATCH 1/2] loki distributed namespaces for various hpa, pdb, etc Signed-off-by: Bryan SebaRaj --- charts/loki-distributed/templates/distributor/hpa.yaml | 1 + charts/loki-distributed/templates/gateway/configmap-gateway.yaml | 1 + .../loki-distributed/templates/gateway/deployment-gateway.yaml | 1 + charts/loki-distributed/templates/gateway/hpa.yaml | 1 + charts/loki-distributed/templates/gateway/ingress-gateway.yaml | 1 + .../templates/gateway/poddisruptionbudget-gateway.yaml | 1 + charts/loki-distributed/templates/gateway/secret-gateway.yaml | 1 + charts/loki-distributed/templates/gateway/service-gateway.yaml | 1 + .../index-gateway/poddisruptionbudget-index-gateway.yaml | 1 + charts/loki-distributed/templates/ruler/configmap-ruler.yaml | 1 + charts/loki-distributed/templates/ruler/deployment-ruler.yaml | 1 + .../templates/ruler/persistentvolumeclaim-ruler.yaml | 1 + .../templates/ruler/poddisruptionbudget-ruler.yaml | 1 + charts/loki-distributed/templates/ruler/service-ruler.yaml | 1 + charts/loki-distributed/templates/ruler/statefulset-ruler.yaml | 1 + 15 files changed, 15 insertions(+) diff --git a/charts/loki-distributed/templates/distributor/hpa.yaml b/charts/loki-distributed/templates/distributor/hpa.yaml index 7a907392a2..d9ef5e5b0c 100644 --- a/charts/loki-distributed/templates/distributor/hpa.yaml +++ b/charts/loki-distributed/templates/distributor/hpa.yaml @@ -4,6 +4,7 @@ apiVersion: {{ $apiVersion }} kind: HorizontalPodAutoscaler metadata: name: {{ include "loki.distributorFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.distributorLabels" . | nindent 4 }} spec: diff --git a/charts/loki-distributed/templates/gateway/configmap-gateway.yaml b/charts/loki-distributed/templates/gateway/configmap-gateway.yaml index 9d99b3ed00..1eb3e2e4f4 100644 --- a/charts/loki-distributed/templates/gateway/configmap-gateway.yaml +++ b/charts/loki-distributed/templates/gateway/configmap-gateway.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "loki.gatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" . | nindent 4 }} data: diff --git a/charts/loki-distributed/templates/gateway/deployment-gateway.yaml b/charts/loki-distributed/templates/gateway/deployment-gateway.yaml index c3c2d61e97..91ee1724f2 100644 --- a/charts/loki-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/loki-distributed/templates/gateway/deployment-gateway.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "loki.gatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" . | nindent 4 }} {{- with .Values.loki.annotations }} diff --git a/charts/loki-distributed/templates/gateway/hpa.yaml b/charts/loki-distributed/templates/gateway/hpa.yaml index 937d44766a..80be99869f 100644 --- a/charts/loki-distributed/templates/gateway/hpa.yaml +++ b/charts/loki-distributed/templates/gateway/hpa.yaml @@ -4,6 +4,7 @@ apiVersion: {{ $apiVersion }} kind: HorizontalPodAutoscaler metadata: name: {{ include "loki.gatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" . | nindent 4 }} spec: diff --git a/charts/loki-distributed/templates/gateway/ingress-gateway.yaml b/charts/loki-distributed/templates/gateway/ingress-gateway.yaml index 5214b9a396..dddce9bde9 100644 --- a/charts/loki-distributed/templates/gateway/ingress-gateway.yaml +++ b/charts/loki-distributed/templates/gateway/ingress-gateway.yaml @@ -7,6 +7,7 @@ apiVersion: {{ include "loki.ingress.apiVersion" . }} kind: Ingress metadata: name: {{ include "loki.gatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" . | nindent 4 }} {{- with .Values.gateway.ingress.labels }} diff --git a/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml b/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml index 0929d13bb0..3a6e9c1dd5 100644 --- a/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml +++ b/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml @@ -6,6 +6,7 @@ apiVersion: {{ include "loki.pdb.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ include "loki.gatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" . | nindent 4 }} spec: diff --git a/charts/loki-distributed/templates/gateway/secret-gateway.yaml b/charts/loki-distributed/templates/gateway/secret-gateway.yaml index f7cc8a6765..95bd717a09 100644 --- a/charts/loki-distributed/templates/gateway/secret-gateway.yaml +++ b/charts/loki-distributed/templates/gateway/secret-gateway.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "loki.gatewayFullname" $ }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" $ | nindent 4 }} stringData: diff --git a/charts/loki-distributed/templates/gateway/service-gateway.yaml b/charts/loki-distributed/templates/gateway/service-gateway.yaml index 0c9afc1812..2c8c43a331 100644 --- a/charts/loki-distributed/templates/gateway/service-gateway.yaml +++ b/charts/loki-distributed/templates/gateway/service-gateway.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "loki.gatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.gatewayLabels" . | nindent 4 }} {{- with .Values.gateway.service.labels }} diff --git a/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml b/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml index 4c79e0d4f8..cc2508ea1e 100644 --- a/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml +++ b/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml @@ -6,6 +6,7 @@ apiVersion: {{ include "loki.pdb.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ include "loki.indexGatewayFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.indexGatewayLabels" . | nindent 4 }} spec: diff --git a/charts/loki-distributed/templates/ruler/configmap-ruler.yaml b/charts/loki-distributed/templates/ruler/configmap-ruler.yaml index c0599d5431..d54672135d 100644 --- a/charts/loki-distributed/templates/ruler/configmap-ruler.yaml +++ b/charts/loki-distributed/templates/ruler/configmap-ruler.yaml @@ -5,6 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "loki.rulerFullname" $ }}-{{ include "loki.rulerRulesDirName" $dir }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.rulerLabels" $ | nindent 4 }} data: diff --git a/charts/loki-distributed/templates/ruler/deployment-ruler.yaml b/charts/loki-distributed/templates/ruler/deployment-ruler.yaml index 955c5e6ff8..3f4479fb0f 100644 --- a/charts/loki-distributed/templates/ruler/deployment-ruler.yaml +++ b/charts/loki-distributed/templates/ruler/deployment-ruler.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "loki.rulerFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.rulerLabels" . | nindent 4 }} app.kubernetes.io/part-of: memberlist diff --git a/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml b/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml index 2fde96d5c0..320f50296b 100644 --- a/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml +++ b/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: data-{{ include "loki.rulerFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.rulerLabels" . | nindent 4 }} {{- with .Values.ruler.persistence.annotations }} diff --git a/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml b/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml index e418d0b3ac..7511cb12b2 100644 --- a/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml +++ b/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml @@ -6,6 +6,7 @@ apiVersion: {{ include "loki.pdb.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ include "loki.rulerFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.rulerLabels" . | nindent 4 }} spec: diff --git a/charts/loki-distributed/templates/ruler/service-ruler.yaml b/charts/loki-distributed/templates/ruler/service-ruler.yaml index 710ab8206c..9bd6499e30 100644 --- a/charts/loki-distributed/templates/ruler/service-ruler.yaml +++ b/charts/loki-distributed/templates/ruler/service-ruler.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "loki.rulerFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.rulerSelectorLabels" . | nindent 4 }} {{- with .Values.ruler.serviceLabels }} diff --git a/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml b/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml index 2172851700..529055a777 100644 --- a/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml +++ b/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ include "loki.rulerFullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "loki.rulerLabels" . | nindent 4 }} app.kubernetes.io/part-of: memberlist From 1c747bbb8b98df8ef0beab25bd4b017271ad6327 Mon Sep 17 00:00:00 2001 From: Bryan SebaRaj Date: Fri, 29 Aug 2025 21:29:46 -0400 Subject: [PATCH 2/2] update version Signed-off-by: Bryan SebaRaj --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 2ccb1c4ee9..b0d97d320d 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.9.13 -version: 0.80.5 +version: 0.80.6 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 6693b86cf4..ca3e467983 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.80.5](https://img.shields.io/badge/Version-0.80.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.13](https://img.shields.io/badge/AppVersion-2.9.13-informational?style=flat-square) +![Version: 0.80.6](https://img.shields.io/badge/Version-0.80.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.13](https://img.shields.io/badge/AppVersion-2.9.13-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode