feat: allow configuration of service trafficDistribution parameter

frittentheke · frittentheke · commit 105cb07b3f95 · 2025-10-21T15:58:17.000+02:00
Fixes: #19557
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,8 @@ Entries should include a reference to the pull request that introduced the chang
 
 ## Unreleased
 
+- [ENHANCEMENT] Added `trafficDistribution` configuration option to backend, compactor, distributor, gateway, index-gateway, ingester, querier, query-frontend, query-scheduler,read and write services to enable same-zone traffic routing. #19557
+
 ## 6.43.0
 
 - [BREAKING]  **Loki UI has been completely removed from the Helm chart.**  The experimental Loki UI has been moved to a [Grafana Plugin] (https://github.com/grafana/loki-operational-ui). Enabling the UI in the Helm chart will now only enable the APIs needed by the plugin, and will host them on the querier. The gateway will now forward all UI requests to the queriers. Users who previously had `loki.ui.enabled: true` should remove this configuration and migrate to the Grafana Loki plugin for UI functionality. [#19390](https://github.com/grafana/loki/pull/19390)
diff --git a/production/helm/loki/templates/backend/service-backend.yaml b/production/helm/loki/templates/backend/service-backend.yaml
@@ -34,4 +34,7 @@ spec:
       protocol: TCP
   selector:
     {{- include "loki.backendSelectorLabels" . | nindent 4 }}
+{{- if .Values.backend.service.trafficDistribution }}
+  trafficDistribution: {{ .Values.backend.service.trafficDistribution }}
+{{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/gateway/service-gateway.yaml b/production/helm/loki/templates/gateway/service-gateway.yaml
@@ -40,4 +40,7 @@ spec:
       protocol: TCP
   selector:
     {{- include "loki.gatewaySelectorLabels" . | nindent 4 }}
+{{- if .Values.gateway.service.trafficDistribution }}
+  trafficDistribution: {{ .Values.gateway.service.trafficDistribution }}
+{{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/index-gateway/service-index-gateway.yaml b/production/helm/loki/templates/index-gateway/service-index-gateway.yaml
@@ -33,4 +33,7 @@ spec:
       {{- end }}
   selector:
     {{- include "loki.indexGatewaySelectorLabels" . | nindent 4 }}
+{{- if .Values.indexGateway.trafficDistribution }}
+  trafficDistribution: {{ .Values.indexGateway.trafficDistribution }}
+{{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/ingester/service-ingester.yaml b/production/helm/loki/templates/ingester/service-ingester.yaml
@@ -33,4 +33,7 @@ spec:
       {{- end }}
   selector:
     {{- include "loki.ingesterSelectorLabels" . | nindent 4 }}
+{{- if .Values.ingester.trafficDistribution }}
+  trafficDistribution: {{ .Values.ingester.trafficDistribution }}
+{{- end }}
 {{- end -}}
diff --git a/production/helm/loki/templates/querier/service-querier.yaml b/production/helm/loki/templates/querier/service-querier.yaml
@@ -33,4 +33,7 @@ spec:
       {{- end }}
   selector:
     {{- include "loki.querierSelectorLabels" . | nindent 4 }}
+{{- if .Values.querier.trafficDistribution }}
+  trafficDistribution: {{ .Values.querier.trafficDistribution }}
+{{- end }}
 {{- end -}}
diff --git a/production/helm/loki/templates/query-frontend/service-query-frontend.yaml b/production/helm/loki/templates/query-frontend/service-query-frontend.yaml
@@ -41,4 +41,7 @@ spec:
       {{- end }}
   selector:
     {{- include "loki.queryFrontendSelectorLabels" . | nindent 4 }}
+{{- if .Values.queryFrontend.trafficDistribution }}
+  trafficDistribution: {{ .Values.queryFrontend.trafficDistribution }}
+{{- end }}
 {{- end -}}
diff --git a/production/helm/loki/templates/query-scheduler/service-query-scheduler.yaml b/production/helm/loki/templates/query-scheduler/service-query-scheduler.yaml
@@ -35,4 +35,7 @@ spec:
       {{- end }}
   selector:
     {{- include "loki.querySchedulerSelectorLabels" . | nindent 4 }}
+{{- if .Values.queryScheduler.trafficDistribution }}
+  trafficDistribution: {{ .Values.queryScheduler.trafficDistribution }}
+{{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/read/service-read.yaml b/production/helm/loki/templates/read/service-read.yaml
@@ -34,4 +34,7 @@ spec:
       protocol: TCP
   selector:
     {{- include "loki.readSelectorLabels" . | nindent 4 }}
+{{- if .Values.read.service.trafficDistribution }}
+  trafficDistribution: {{ .Values.read.service.trafficDistribution }}
+{{- end }}
 {{- end }}
diff --git a/production/helm/loki/templates/write/service-write.yaml b/production/helm/loki/templates/write/service-write.yaml
@@ -34,4 +34,7 @@ spec:
       protocol: TCP
   selector:
     {{- include "loki.writeSelectorLabels" . | nindent 4 }}
+{{- if .Values.write.service.trafficDistribution }}
+  trafficDistribution: {{ .Values.write.service.trafficDistribution }}
+{{- end }}
 {{- end }}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -1153,6 +1153,8 @@ gateway:
     annotations: {}
     # -- Labels for gateway service
     labels: {}
+    # -- trafficDistribution for gateway service
+    trafficDistribution: ""
   # Gateway ingress configuration
   ingress:
     # -- Specifies whether an ingress for the gateway should be created
@@ -1460,6 +1462,8 @@ singleBinary:
     labels: {}
     # -- Service Type for single binary Service
     type: "ClusterIP"
+    # -- trafficDistribution single binary Service
+    trafficDistribution: ""
   # -- Comma-separated list of Loki modules to load for the single binary
   targetModule: "all"
   # -- Labels for single binary service
@@ -1591,6 +1595,8 @@ write:
     labels: {}
     # -- Service Type for write Service
     type: "ClusterIP"
+    # -- trafficDistribution for write service
+    trafficDistribution: ""
   # -- Comma-separated list of Loki modules to load for the write
   targetModule: "write"
   # -- Additional CLI args for the write
@@ -1725,6 +1731,8 @@ read:
     labels: {}
     # -- Service Type for read Service
     type: ClusterIP
+    # -- trafficDistribution for read service
+    trafficDistribution: ""
   # -- Comma-separated list of Loki modules to load for the read
   targetModule: "read"
   # -- Whether or not to use the 2 target type simple scalable mode (read, write) or the
@@ -1852,6 +1860,8 @@ backend:
     labels: {}
     # -- Service type for backend Service
     type: ClusterIP
+    # -- trafficDistribution for backend Service
+    trafficDistribution: ""
   # -- Comma-separated list of Loki modules to load for the backend
   targetModule: "backend"
   # -- Additional CLI args for the backend
@@ -1989,11 +1999,11 @@ ingester:
   # -- Annotations for ingester pods
   podAnnotations: {}
   # -- The name of the PriorityClass for ingester pods
-  # -- Labels for ingestor service
+  # -- Labels for ingester service
   serviceLabels: {}
-  # -- Annotations for ingestor service
+  # -- Annotations for ingester service
   serviceAnnotations: {}
-  # -- Service type for ingestor service
+  # -- Service type for ingester service
   serviceType: "ClusterIP"
   # -- Additional CLI args for the ingester
   extraArgs: []
@@ -2087,6 +2097,8 @@ ingester:
   appProtocol:
     # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
     grpc: ""
+  # -- trafficDistribution for ingester service
+  trafficDistribution: ""
   # -- Enabling zone awareness on ingesters will create 3 statefulests where all writes will send a replica to each zone.
   # This is primarily intended to accelerate rollout operations by allowing for multiple ingesters within a single
   # zone to be shutdown and restart simultaneously (the remaining 2 zones will be guaranteed to have at least one copy
@@ -2365,6 +2377,8 @@ querier:
   appProtocol:
     # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
     grpc: ""
+  # -- trafficDistribution for querier service
+  trafficDistribution: ""
 # -- Configuration for the query-frontend
 queryFrontend:
   # -- Number of replicas for the query-frontend
@@ -2467,6 +2481,8 @@ queryFrontend:
   appProtocol:
     # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
     grpc: ""
+  # -- trafficDistribution for query-frontend service
+  trafficDistribution: ""
 # -- Configuration for the query-scheduler
 queryScheduler:
   # -- Number of replicas for the query-scheduler.
@@ -2541,6 +2557,8 @@ queryScheduler:
   # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
   appProtocol:
     grpc: ""
+  # -- trafficDistribution for query-scheduler service
+  trafficDistribution: ""
 # -- Configuration for the index-gateway
 indexGateway:
   # -- Number of replicas for the index-gateway
@@ -2641,6 +2659,8 @@ indexGateway:
   # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
   appProtocol:
     grpc: ""
+  # -- trafficDistribution for index-gateway service
+  trafficDistribution: ""
   # -- UpdateStrategy for the indexGateway StatefulSet.
   updateStrategy:
     # -- One of  'OnDelete' or 'RollingUpdate'
