diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index 4e4d922405f..070f3ead92e 100644 --- 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 index 7216b017906..b56015671d1 100644 --- 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/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml index 78a2267c522..927233d21b9 100644 --- a/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml +++ b/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 -}} diff --git a/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml b/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml index a511f5c3bb7..8c93674bc71 100644 --- 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 index 5f768404f1e..50c6bc50851 100644 --- 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/operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-svc-headless.yaml index 59aceb6d50a..65e38cd774d 100644 --- a/operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-svc-headless.yaml +++ b/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 -}} 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 index aae207d8596..a53b66f574a 100644 --- 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 index 1f3741f2c80..4cbc4195bc1 100644 --- 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/operations/helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-svc.yaml b/operations/helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-svc.yaml index 9cb1691da28..c4f8964b603 100644 --- a/operations/helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-svc.yaml +++ b/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 }} diff --git a/operations/helm/charts/mimir-distributed/templates/gateway/gateway-svc.yaml b/operations/helm/charts/mimir-distributed/templates/gateway/gateway-svc.yaml index 88032a5f723..ce59807de67 100644 --- 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/operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-svc.yaml b/operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-svc.yaml index b954ebe8155..e8e029ea48c 100644 --- a/operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-svc.yaml +++ b/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 -}} \ No newline at end of file diff --git a/operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-svc.yaml b/operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-svc.yaml index 07c02f16867..f5c1b684d6e 100644 --- a/operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-svc.yaml +++ b/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 -}} 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 index c0e572e42c9..677168e02a7 100644 --- 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 index 7ed6bd2d66c..bfbdf017a7a 100644 --- 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 index cb41f7fa4e1..6bcb3a1d128 100644 --- 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 index cb87a760daf..1af4e9cb604 100644 --- 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/operations/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml b/operations/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml index 3f26a9689c9..e4b3fb5f396 100644 --- a/operations/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml +++ b/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 -}} diff --git a/operations/helm/charts/mimir-distributed/templates/querier/querier-svc.yaml b/operations/helm/charts/mimir-distributed/templates/querier/querier-svc.yaml index 309b49730f6..faa68299e67 100644 --- 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/operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml index 6fd0ef2c9a9..46e213973b2 100644 --- a/operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml +++ b/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 }} 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 index b4a704bd39e..5fcfa412eb6 100644 --- 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/operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc-headless.yaml index f79753c3ddd..4c659dadb77 100644 --- a/operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-svc-headless.yaml +++ b/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 }} 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 index 0aebe04c39d..eb99539e651 100644 --- 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 index 99c1e5e3f6b..934151e0714 100644 --- 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 }} \ No newline at end of file diff --git a/operations/helm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-svc.yaml b/operations/helm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-svc.yaml index d259578daf7..014289b9dad 100644 --- a/operations/helm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-svc.yaml +++ b/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 }} diff --git a/operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc-headless.yaml index 073adbfd122..0461e7617ba 100644 --- a/operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc-headless.yaml +++ b/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 }} diff --git a/operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc.yaml b/operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc.yaml index fa0ee303937..454fcf8cb27 100644 --- a/operations/helm/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-svc.yaml +++ b/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 }} diff --git a/operations/helm/charts/mimir-distributed/templates/ruler/ruler-svc.yaml b/operations/helm/charts/mimir-distributed/templates/ruler/ruler-svc.yaml index 77709c445e0..5771d515fe0 100644 --- 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/operations/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml index 0f55dc68057..c8ec148e8a7 100644 --- a/operations/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml +++ b/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 }} 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 index ac805b66714..afae230e2c9 100644 --- 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 }} diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index b6613c9366e..de1b3a662bb 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -595,6 +595,11 @@ alertmanager: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] + # - port: 11811 + # protocol: TCP + # name: reverse-proxy + # targetPort: 11811 # -- Optionally set the scheduler for pods of the alertmanager schedulerName: "" @@ -879,6 +884,7 @@ distributor: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -982,6 +988,7 @@ ingester: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] # -- Optionally set the scheduler for pods of the ingester schedulerName: "" @@ -1215,6 +1222,7 @@ overrides_exporter: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] strategy: type: RollingUpdate @@ -1329,6 +1337,7 @@ ruler: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] # -- Dedicated service account for ruler pods. # If not set, the default service account defined at the begining of this file will be used. @@ -1466,6 +1475,7 @@ ruler_querier: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -1582,6 +1592,7 @@ ruler_query_frontend: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -1675,6 +1686,7 @@ ruler_query_scheduler: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -1812,6 +1824,7 @@ querier: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -1930,6 +1943,7 @@ query_frontend: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -2024,6 +2038,7 @@ query_scheduler: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] resources: requests: @@ -2123,6 +2138,7 @@ store_gateway: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] # -- Optionally set the scheduler for pods of the store-gateway schedulerName: "" @@ -2346,6 +2362,7 @@ compactor: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] # -- Optionally set the scheduler for pods of the compactor schedulerName: "" @@ -2619,6 +2636,7 @@ chunks-cache: service: annotations: {} labels: {} + extraPorts: [] index-cache: # -- Specifies whether memcached based index-cache should be enabled @@ -2719,6 +2737,7 @@ index-cache: service: annotations: {} labels: {} + extraPorts: [] metadata-cache: # -- Specifies whether memcached based metadata-cache should be enabled @@ -2819,6 +2838,7 @@ metadata-cache: service: annotations: {} labels: {} + extraPorts: [] results-cache: # -- Specifies whether memcached based results-cache should be enabled @@ -2919,6 +2939,7 @@ results-cache: service: annotations: {} labels: {} + extraPorts: [] # -- Setting for the Grafana Rollout Operator https://github.com/grafana/helm-charts/tree/main/charts/rollout-operator rollout_operator: @@ -3088,6 +3109,7 @@ nginx: labels: {} # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster + extraPorts: [] # Ingress configuration ingress: # -- Specifies whether an ingress for the nginx should be created @@ -3497,6 +3519,7 @@ gateway: nameOverride: "" # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster + extraPorts: [] ingress: enabled: false @@ -4142,6 +4165,7 @@ admin_api: # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster type: ClusterIP + extraPorts: [] initContainers: [] @@ -4293,6 +4317,7 @@ admin-cache: service: annotations: {} labels: {} + extraPorts: [] graphite: # -- If true, enables graphite querier and graphite write proxy functionality. @@ -4318,6 +4343,7 @@ graphite: service: annotations: {} labels: {} + extraPorts: [] # -- Resources for graphite-querier pods resources: @@ -4399,6 +4425,7 @@ graphite: service: annotations: {} labels: {} + extraPorts: [] # -- Resources for graphite-write-proxy pods resources: @@ -4539,6 +4566,7 @@ gr-aggr-cache: service: annotations: {} labels: {} + extraPorts: [] # Graphite's metric name cache. If you want to know more about it please check # https://grafana.com/docs/enterprise-metrics/latest/graphite/graphite_querier/#metric-name-cache @@ -4604,6 +4632,7 @@ gr-metricname-cache: service: annotations: {} labels: {} + extraPorts: [] federation_frontend: # -- Specifies whether the federation-frontend should be enabled @@ -4695,6 +4724,8 @@ federation_frontend: annotations: {} # -- Additional labels for the federation-frontend service labels: {} + extraPorts: [] + # -- Pod Disruption Budget configuration podDisruptionBudget: maxUnavailable: 1 @@ -4811,6 +4842,7 @@ continuous_test: service: annotations: {} labels: {} + extraPorts: [] # -- Upgrade strategy for the continuous test Deployment strategy: type: RollingUpdate