[feature] helm: add service.extraPorts to all components

CHANGELOG.md

@@ -16,6 +16,7 @@
 * [CHANGE] Ruler: Add `user` and `reason` labels to `cortex_ruler_write_requests_failed_total` and `cortex_ruler_queries_failed_total`; add `user` to
     `cortex_ruler_write_requests_total` and `cortex_ruler_queries_total` metrics. #10536
 * [FEATURE] Distributor: Add experimental Influx handler. #10153
+* [FEATURE] Helm: Add support for `.service.extraPorts` on all components. #10659
 * [ENHANCEMENT] Compactor: Expose `cortex_bucket_index_last_successful_update_timestamp_seconds` for all tenants assigned to the compactor before starting the block cleanup job. #10569
 * [ENHANCEMENT] Query Frontend: Return server-side `samples_processed` statistics. #10103
 * [ENHANCEMENT] Distributor: OTLP receiver now converts also metric metadata. See also https://github.com/prometheus/prometheus/pull/15416. #10168

operations/helm/charts/mimir-distributed/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 5.7.0-weekly.330
+version: 5.8.0-weekly.330
 appVersion: r330
 description: "Grafana Mimir"
 home: https://grafana.com/docs/helm-charts/mimir-distributed/latest/

operations/helm/charts/mimir-distributed/README.md

@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/latest/)
 
 For the full documentation, visit [Grafana mimir-distributed Helm chart documentation](https://grafana.com/docs/helm-charts/mimir-distributed/latest/).
 
-> **Note:** The documentation version is derived from the Helm chart version which is 5.7.0-weekly.330.
+> **Note:** The documentation version is derived from the Helm chart version which is 5.8.0-weekly.330.
 
 When upgrading from Helm chart version 4.X, please see [Migrate the Helm chart from version 4.x to 5.0](https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-4.x-to-5.0/).
 When upgrading from Helm chart version 3.x, please see [Migrate from single zone to zone-aware replication with Helm](https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-from-single-zone-with-helm/).
@@ -14,7 +14,7 @@ When upgrading from Helm chart version 2.1, please see [Upgrade the Grafana Mimi
 
 # mimir-distributed
 
-![Version: 5.7.0-weekly.330](https://img.shields.io/badge/Version-5.7.0--weekly.330-informational?style=flat-square) ![AppVersion: r330](https://img.shields.io/badge/AppVersion-r330-informational?style=flat-square)
+![Version: 5.8.0-weekly.330](https://img.shields.io/badge/Version-5.8.0--weekly.330-informational?style=flat-square) ![AppVersion: r330](https://img.shields.io/badge/AppVersion-r330-informational?style=flat-square)
 
 Grafana Mimir
 

operations/helm/charts/mimir-distributed/templates/admin-api/admin-api-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.admin_api.service.extraPorts }}
+    {{- toYaml .Values.admin_api.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "admin-api" "memberlist" true) | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml

@@ -29,6 +29,9 @@ spec:
     - port: {{ $clusterPort }}
       protocol: TCP
       name: cluster
+    {{- if .Values.alertmanager.service.extraPorts }}
+    {{- toYaml .Values.alertmanager.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "alertmanager" "memberlist" true) | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml

@@ -34,6 +34,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.alertmanager.service.extraPorts }}
+    {{- toYaml .Values.alertmanager.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" $args | nindent 4 }}
 

operations/helm/charts/mimir-distributed/templates/compactor/compactor-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.compactor.service.extraPorts }}
+    {{- toYaml .Values.compactor.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "compactor" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-svc-headless.yaml

@@ -20,6 +20,9 @@ spec:
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics
+    {{- if .Values.continuous_test.service.extraPorts }}
+    {{- toYaml .Values.continuous_test.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "continuous-test") | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml

@@ -24,6 +24,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.distributor.service.extraPorts }}
+    {{- toYaml .Values.distributor.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "distributor" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.distributor.service.extraPorts }}
+    {{- toYaml .Values.distributor.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "distributor" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-svc.yaml

@@ -22,6 +22,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.federation_frontend.service.extraPorts }}
+    {{- toYaml .Values.federation_frontend.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "federation-frontend") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/gateway/gateway-svc.yaml

@@ -36,6 +36,9 @@ spec:
       name: legacy-http-metrics
       targetPort: http-metrics
     {{- end }}
+    {{- if .Values.gateway.service.extraPorts }}
+    {{- toYaml .Values.gateway.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" $ "component" "gateway") | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-svc.yaml

@@ -22,6 +22,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.graphite.querier.service.extraPorts }}
+    {{- toYaml .Values.graphite.querier.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "graphite-querier") | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-svc.yaml

@@ -22,6 +22,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.graphite.write_proxy.service.extraPorts }}
+    {{- toYaml .Values.graphite.write_proxy.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "graphite-write-proxy") | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/ingester/ingester-svc-headless.yaml

@@ -24,6 +24,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.ingester.service.extraPorts }}
+    {{- toYaml .Values.ingester.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "ingester" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/ingester/ingester-svc.yaml

@@ -34,6 +34,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.ingester.service.extraPorts }}
+    {{- toYaml .Values.ingester.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" $args | nindent 4 }}
 

operations/helm/charts/mimir-distributed/templates/memcached/_memcached-svc.tpl

@@ -28,6 +28,9 @@ spec:
       port: 9150
       targetPort: 9150
     {{ end }}
+    {{- if .service.extraPorts }}
+    {{- toYaml .service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" $.ctx "component" $.component) | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/nginx/nginx-svc.yaml

@@ -31,6 +31,9 @@ spec:
       nodePort: {{ .Values.nginx.service.nodePort }}
       {{- end }}
       protocol: TCP
+    {{- if .Values.nginx.service.extraPorts }}
+    {{- toYaml .Values.nginx.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "nginx") | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.overrides_exporter.service.extraPorts }}
+    {{- toYaml .Values.overrides_exporter.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "overrides-exporter") | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/querier/querier-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.querier.service.extraPorts }}
+    {{- toYaml .Values.querier.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "querier" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.query_frontend.service.extraPorts }}
+    {{- toYaml .Values.query_frontend.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "query-frontend") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.query_frontend.service.extraPorts }}
+    {{- toYaml .Values.query_frontend.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "query-frontend") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc-headless.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.query_scheduler.service.extraPorts }}
+    {{- toYaml .Values.query_scheduler.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "query-scheduler") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.query_scheduler.service.extraPorts }}
+    {{- toYaml .Values.query_scheduler.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "query-scheduler") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/ruler-querier/ruler-querier-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.ruler_querier.service.extraPorts }}
+    {{- toYaml .Values.ruler_querier.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-querier" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.ruler_query_frontend.service.extraPorts }}
+    {{- toYaml .Values.ruler_query_frontend.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-query-frontend") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc-headless.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.ruler_query_scheduler.service.extraPorts }}
+    {{- toYaml .Values.ruler_query_scheduler.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-query-scheduler") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc.yaml

@@ -25,6 +25,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.ruler_query_scheduler.service.extraPorts }}
+    {{- toYaml .Values.ruler_query_scheduler.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-query-scheduler") | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/ruler/ruler-svc.yaml

@@ -21,6 +21,9 @@ spec:
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics
+    {{- if .Values.ruler.service.extraPorts }}
+    {{- toYaml .Values.ruler.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler" "memberlist" true) | nindent 4 }}
 {{- end -}}

operations/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml

@@ -24,6 +24,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.store_gateway.service.extraPorts }}
+    {{- toYaml .Values.store_gateway.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" (dict "ctx" . "component" "store-gateway" "memberlist" true) | nindent 4 }}
 {{- end }}

operations/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml

@@ -34,6 +34,9 @@ spec:
       protocol: TCP
       name: grpc
       targetPort: grpc
+    {{- if .Values.store_gateway.service.extraPorts }}
+    {{- toYaml .Values.store_gateway.service.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "mimir.selectorLabels" $args | nindent 4 }}