Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## master / unreleased

* [ENHANCEMENT] Make `extraPorts` work for all components: the ports are added to the cortex container and exposed on the component services #409

## 3.7.0 / 2026-11-20

* [ENHANCEMENT] Render `podAnnotations` with `tpl`, so the default `prometheus.io/port` annotations follow `config.server.http_listen_port` #410
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Kubernetes: `^1.19.0-0`
| alertmanager.​env | list | `[]` | Extra env variables to pass to the cortex container |
| alertmanager.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log level (debug, info, warn, error) |
| alertmanager.​extraContainers | list | `[]` | Additional containers to be added to the cortex pod. |
| alertmanager.​extraPorts | list | `[]` | Additional ports to the cortex services. Useful to expose extra container ports. |
| alertmanager.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| alertmanager.​extraVolumeMounts | list | `[]` | Extra volume mounts that will be added to the cortex container |
| alertmanager.​extraVolumes | list | `[]` | Additional volumes to the cortex pod. |
| alertmanager.​initContainers | list | `[]` | Init containers to be added to the cortex pod. |
Expand Down Expand Up @@ -187,7 +187,7 @@ Kubernetes: `^1.19.0-0`
| compactor.​env | list | `[]` | |
| compactor.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| compactor.​extraContainers | list | `[]` | |
| compactor.​extraPorts | list | `[]` | |
| compactor.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| compactor.​extraVolumeMounts | list | `[]` | |
| compactor.​extraVolumes | list | `[]` | |
| compactor.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -282,7 +282,7 @@ Kubernetes: `^1.19.0-0`
| distributor.​env | list | `[]` | |
| distributor.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| distributor.​extraContainers | list | `[]` | |
| distributor.​extraPorts | list | `[]` | |
| distributor.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| distributor.​extraVolumeMounts | list | `[]` | |
| distributor.​extraVolumes | list | `[]` | |
| distributor.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -352,7 +352,7 @@ Kubernetes: `^1.19.0-0`
| ingester.​env | list | `[]` | |
| ingester.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| ingester.​extraContainers | list | `[]` | |
| ingester.​extraPorts | list | `[]` | |
| ingester.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| ingester.​extraVolumeMounts | list | `[]` | |
| ingester.​extraVolumes | list | `[]` | |
| ingester.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -505,7 +505,7 @@ Kubernetes: `^1.19.0-0`
| nginx.​env | list | `[]` | |
| nginx.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| nginx.​extraContainers | list | `[]` | |
| nginx.​extraPorts | list | `[]` | |
| nginx.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| nginx.​extraVolumeMounts | list | `[]` | |
| nginx.​extraVolumes | list | `[]` | |
| nginx.​http_listen_port | int | `80` | |
Expand Down Expand Up @@ -551,7 +551,7 @@ Kubernetes: `^1.19.0-0`
| overrides_exporter.​env | list | `[]` | |
| overrides_exporter.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| overrides_exporter.​extraContainers | list | `[]` | |
| overrides_exporter.​extraPorts | list | `[]` | |
| overrides_exporter.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| overrides_exporter.​extraVolumeMounts | list | `[]` | |
| overrides_exporter.​extraVolumes | list | `[]` | |
| overrides_exporter.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -596,7 +596,7 @@ Kubernetes: `^1.19.0-0`
| parquet_converter.​env | list | `[]` | |
| parquet_converter.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| parquet_converter.​extraContainers | list | `[]` | |
| parquet_converter.​extraPorts | list | `[]` | |
| parquet_converter.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| parquet_converter.​extraVolumeMounts | list | `[]` | |
| parquet_converter.​extraVolumes | list | `[]` | |
| parquet_converter.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -646,7 +646,7 @@ Kubernetes: `^1.19.0-0`
| purger.​env | list | `[]` | Extra env variables to pass to the cortex container |
| purger.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| purger.​extraContainers | list | `[]` | Additional containers to be added to the cortex pod. |
| purger.​extraPorts | list | `[]` | Additional ports to the cortex services. Useful to expose extra container ports. |
| purger.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| purger.​extraVolumeMounts | list | `[]` | Extra volume mounts that will be added to the cortex container |
| purger.​extraVolumes | list | `[]` | Additional volumes to the cortex pod. |
| purger.​initContainers | list | `[]` | Init containers to be added to the cortex pod. |
Expand Down Expand Up @@ -701,7 +701,7 @@ Kubernetes: `^1.19.0-0`
| querier.​env | list | `[]` | |
| querier.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| querier.​extraContainers | list | `[]` | |
| querier.​extraPorts | list | `[]` | |
| querier.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| querier.​extraVolumeMounts | list | `[]` | |
| querier.​extraVolumes | list | `[]` | |
| querier.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -748,7 +748,7 @@ Kubernetes: `^1.19.0-0`
| query_frontend.​env | list | `[]` | |
| query_frontend.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| query_frontend.​extraContainers | list | `[]` | |
| query_frontend.​extraPorts | list | `[]` | |
| query_frontend.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| query_frontend.​extraVolumeMounts | list | `[]` | |
| query_frontend.​extraVolumes | list | `[]` | |
| query_frontend.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -796,7 +796,7 @@ Kubernetes: `^1.19.0-0`
| query_scheduler.​env | list | `[]` | |
| query_scheduler.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| query_scheduler.​extraContainers | list | `[]` | |
| query_scheduler.​extraPorts | list | `[]` | |
| query_scheduler.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| query_scheduler.​extraVolumeMounts | list | `[]` | |
| query_scheduler.​extraVolumes | list | `[]` | |
| query_scheduler.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -858,7 +858,7 @@ Kubernetes: `^1.19.0-0`
| ruler.​env | list | `[]` | |
| ruler.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| ruler.​extraContainers | list | `[]` | |
| ruler.​extraPorts | list | `[]` | |
| ruler.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| ruler.​extraVolumeMounts | list | `[]` | |
| ruler.​extraVolumes | list | `[]` | |
| ruler.​initContainers | list | `[]` | |
Expand Down Expand Up @@ -944,7 +944,7 @@ Kubernetes: `^1.19.0-0`
| store_gateway.​env | list | `[]` | |
| store_gateway.​extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
| store_gateway.​extraContainers | list | `[]` | |
| store_gateway.​extraPorts | list | `[]` | |
| store_gateway.​extraPorts | list | `[]` | Additional container ports, as in the Kubernetes ContainerPort spec. Each one is also exposed on the services under its name. |
| store_gateway.​extraVolumeMounts | list | `[]` | |
| store_gateway.​extraVolumes | list | `[]` | |
| store_gateway.​initContainers | list | `[]` | |
Expand Down
13 changes: 13 additions & 0 deletions templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,16 @@ This helper validates that if memcached image is set to official image, args are
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Service ports for the extraPorts of a component. Each extra container port is
exposed on the service under its own name and port.
*/}}
{{- define "cortex.extraServicePorts" -}}
{{- range . }}
- port: {{ .containerPort }}
protocol: {{ .protocol | default "TCP" }}
name: {{ required "extraPorts entries need a name so they can be exposed on the service" .name }}
targetPort: {{ .name }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/alertmanager/alertmanager-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ spec:
- name: gossip
containerPort: {{ .Values.config.memberlist.bind_port }}
protocol: TCP
{{- with .Values.alertmanager.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.alertmanager.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/alertmanager/alertmanager-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@ spec:
- containerPort: {{ $svcClusterPort }}
name: alert-clu-udp
protocol: UDP
{{- with .Values.alertmanager.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.alertmanager.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/alertmanager/alertmanager-svc-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ spec:
protocol: TCP
name: alert-clu-tcp
targetPort: alert-clu-tcp
{{- with .Values.alertmanager.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.alertmanagerSelectorLabels" . | nindent 4 }}
{{- end -}}
3 changes: 3 additions & 0 deletions templates/alertmanager/alertmanager-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.alertmanager.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.alertmanagerSelectorLabels" . | nindent 4 }}
{{- with .Values.alertmanager.service.trafficDistribution }}
Expand Down
3 changes: 3 additions & 0 deletions templates/compactor/compactor-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ spec:
- name: gossip
containerPort: {{ .Values.config.memberlist.bind_port }}
protocol: TCP
{{- with .Values.compactor.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.compactor.startupProbe }}
startupProbe:
{{- toYaml .Values.compactor.startupProbe | nindent 12 }}
Expand Down
3 changes: 3 additions & 0 deletions templates/compactor/compactor-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.compactor.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.compactorSelectorLabels" . | nindent 4 }}
{{- end -}}
3 changes: 3 additions & 0 deletions templates/distributor/distributor-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ spec:
- name: grpc
containerPort: {{ .Values.config.server.grpc_listen_port }}
protocol: TCP
{{- with .Values.distributor.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.distributor.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/distributor/distributor-svc-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
protocol: TCP
name: grpc
targetPort: grpc
{{- with .Values.distributor.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.distributorSelectorLabels" . | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/distributor/distributor-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.distributor.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.distributorSelectorLabels" . | nindent 4 }}
{{- with .Values.distributor.service.trafficDistribution }}
Expand Down
3 changes: 3 additions & 0 deletions templates/ingester/ingester-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ spec:
- name: gossip
containerPort: {{ .Values.config.memberlist.bind_port }}
protocol: TCP
{{- with .Values.ingester.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.ingester.startupProbe }}
startupProbe:
{{- toYaml .Values.ingester.startupProbe | nindent 12 }}
Expand Down
3 changes: 3 additions & 0 deletions templates/ingester/ingester-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ spec:
- name: gossip
containerPort: {{ .Values.config.memberlist.bind_port }}
protocol: TCP
{{- with .Values.ingester.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.ingester.startupProbe }}
startupProbe:
{{- toYaml .Values.ingester.startupProbe | nindent 12 }}
Expand Down
3 changes: 3 additions & 0 deletions templates/ingester/ingester-svc-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ spec:
protocol: TCP
name: grpc
targetPort: grpc
{{- with .Values.ingester.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.ingesterSelectorLabels" . | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/ingester/ingester-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.ingester.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.ingesterSelectorLabels" . | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/nginx/nginx-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ spec:
- name: http-metrics
containerPort: {{ .Values.nginx.http_listen_port }}
protocol: TCP
{{- with .Values.nginx.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.nginx.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/nginx/nginx-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.nginx.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.nginxSelectorLabels" . | nindent 4 }}
{{- with .Values.nginx.service.trafficDistribution }}
Expand Down
3 changes: 3 additions & 0 deletions templates/overrides-exporter/overrides-exporter-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ spec:
- name: http-metrics
containerPort: {{ .Values.config.server.http_listen_port }}
protocol: TCP
{{- with .Values.overrides_exporter.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.overrides_exporter.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/overrides-exporter/overrides-exporter-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.overrides_exporter.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.overridesExporterSelectorLabels" . | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/parquet-converter/parquet-converter-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ spec:
- name: http-metrics
containerPort: {{ .Values.config.server.http_listen_port }}
protocol: TCP
{{- with .Values.parquet_converter.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.parquet_converter.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ spec:
- name: http-metrics
containerPort: {{ .Values.config.server.http_listen_port }}
protocol: TCP
{{- with .Values.parquet_converter.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.parquet_converter.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/parquet-converter/parquet-converter-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.parquet_converter.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.parquetConverterSelectorLabels" . | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/purger/purger-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ spec:
- name: grpc
containerPort: {{ .Values.config.server.grpc_listen_port }}
protocol: TCP
{{- with .Values.purger.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.purger.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions templates/purger/purger-svc-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
protocol: TCP
name: grpc
targetPort: grpc
{{- with .Values.purger.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.purgerSelectorLabels" . | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions templates/purger/purger-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
protocol: TCP
name: http-metrics
targetPort: http-metrics
{{- with .Values.purger.extraPorts }}
{{- include "cortex.extraServicePorts" . | trim | nindent 4 }}
{{- end }}
selector:
{{- include "cortex.purgerSelectorLabels" . | nindent 4 }}
{{- end -}}
3 changes: 3 additions & 0 deletions templates/querier/querier-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ spec:
- name: http-metrics
containerPort: {{ .Values.config.server.http_listen_port }}
protocol: TCP
{{- with .Values.querier.extraPorts }}
{{- toYaml . | nindent 12 }}
{{- end }}
startupProbe:
{{- toYaml .Values.querier.startupProbe | nindent 12 }}
livenessProbe:
Expand Down
Loading
Loading