[feature] helm: add service.extraPorts to all components (#10659)

* [feature] helm: add service.extraPorts to all components Signed-off-by: TheRealNoob <[email protected]> * re-arrange changelog.md * bump chart.yaml? Signed-off-by: TheRealNoob <[email protected]> * update README.md Signed-off-by: TheRealNoob <[email protected]> * revert Chart.yaml version bump Signed-off-by: TheRealNoob <[email protected]> * update CHANGELOG.md Signed-off-by: TheRealNoob <[email protected]> * mimir-distributed: rephrase changelog Signed-off-by: Vladimir Varankin <[email protected]> * fixup! mimir-distributed: rephrase changelog * test commit Signed-off-by: TheRealNoob <[email protected]> * Revert "test commit" This reverts commit 332b721. * revert README.md version change Signed-off-by: TheRealNoob <[email protected]> --------- Signed-off-by: TheRealNoob <[email protected]> Signed-off-by: Vladimir Varankin <[email protected]> Co-authored-by: Vladimir Varankin <[email protected]>
grafana · Mar 7, 2025 · 42198d3 · 42198d3
1 parent cccd3cb
commit 42198d3
Show file tree

Hide file tree

Showing 30 changed files with 117 additions and 0 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -39,6 +39,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 * [ENHANCEMENT] Individual mimir components can override their container images via the *.image values. The component's image definitions always override the values set in global `image` or `enterprise.image`. #10340
 * [ENHANCEMENT] Alertmanager, compactor, ingester, and store-gateway StatefulSets can configure their PVC template name via the corresponding *.persistentVolume.name values. #10376
 * [ENHANCEMENT] Set resources for smoke-test job. #10608
+* [ENHANCEMENT] All components can expose additional ports with their respective services via the *.service.extraPorts values. This allows exposing the containers that components declare in `extraContainers`. #10659
 * [BUGFIX] Create proper in-cluster remote URLs when gateway and nginx are disabled. #10625
 * [BUGFIX] Fix calculation of `mimir.siToBytes` and use floating point arithmetics. #10044
 

diff --git a/operations/helm/charts/mimir-distributed/templates/admin-api/admin-api-svc.yaml b/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 -}}
diff --git a/...tions/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml b/...tions/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 -}}
diff --git a/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml b/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 }}
 

diff --git a/operations/helm/charts/mimir-distributed/templates/compactor/compactor-svc.yaml b/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 }}
diff --git a/...helm/charts/mimir-distributed/templates/continuous_test/continuous-test-svc-headless.yaml b/...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 -}}
diff --git a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml b/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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc.yaml b/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 }}
diff --git a/.../helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-svc.yaml b/.../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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/gateway/gateway-svc.yaml b/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 -}}
diff --git a/...rts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-svc.yaml b/...rts/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 -}}
diff --git a/...r-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-svc.yaml b/...r-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 -}}
diff --git a/operations/helm/charts/mimir-distributed/templates/ingester/ingester-svc-headless.yaml b/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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/ingester/ingester-svc.yaml b/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 }}
 

diff --git a/operations/helm/charts/mimir-distributed/templates/memcached/_memcached-svc.tpl b/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 -}}

diff --git a/operations/helm/charts/mimir-distributed/templates/nginx/nginx-svc.yaml b/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 -}}

diff --git a/...ns/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml b/...ns/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 -}}
diff --git a/operations/helm/charts/mimir-distributed/templates/querier/querier-svc.yaml b/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 }}
diff --git a/...s/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml b/...s/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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml b/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 }}
diff --git a/...helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc-headless.yaml b/...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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc.yaml b/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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/ruler-querier/ruler-querier-svc.yaml b/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 }}
diff --git a/...elm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-svc.yaml b/...elm/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 }}
diff --git a/...mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc-headless.yaml b/...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 }}
diff --git a/...m/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc.yaml b/...m/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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/ruler/ruler-svc.yaml b/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 -}}
diff --git a/...ons/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml b/...ons/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 }}
diff --git a/operations/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml b/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 }}