diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e52c228..8cb890c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master / unreleased +* [ENHANCEMENT] Render `podAnnotations` with `tpl`, so the default `prometheus.io/port` annotations follow `config.server.http_listen_port` #410 + ## 3.6.0 / 2026-11-19 * [FEATURE] Parquet converter: allow running it as a StatefulSet with a persistent volume per pod #685 diff --git a/README.md b/README.md index 274ba000..60962865 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Kubernetes: `^1.19.0-0` | alertmanager.​persistentVolume.​size | string | `"2Gi"` | Alertmanager data Persistent Volume size | | alertmanager.​persistentVolume.​storageClass | string | `nil` | Alertmanager data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | alertmanager.​persistentVolume.​subPath | string | `""` | Subdirectory of Alertmanager data Persistent Volume to mount Useful if the volume's root directory is not empty | -| alertmanager.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| alertmanager.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | alertmanager.​podDisruptionBudget | object | `{"maxUnavailable":1}` | If not set then a PodDisruptionBudget will not be created | | alertmanager.​podLabels | object | `{}` | Pod Labels | | alertmanager.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -200,7 +200,7 @@ Kubernetes: `^1.19.0-0` | compactor.​persistentVolume.​size | string | `"2Gi"` | | | compactor.​persistentVolume.​storageClass | string | `nil` | compactor data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | compactor.​persistentVolume.​subPath | string | `""` | Subdirectory of compactor data Persistent Volume to mount Useful if the volume's root directory is not empty | -| compactor.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| compactor.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | compactor.​podDisruptionBudget.​maxUnavailable | string | `"30%"` | | | compactor.​podLabels | object | `{}` | Pod Labels | | compactor.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -291,7 +291,7 @@ Kubernetes: `^1.19.0-0` | distributor.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | distributor.​nodeSelector | object | `{}` | | | distributor.​persistentVolume.​subPath | string | `nil` | | -| distributor.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| distributor.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | distributor.​podDisruptionBudget.​maxUnavailable | string | `"30%"` | | | distributor.​podLabels | object | `{}` | Pod Labels | | distributor.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -366,7 +366,7 @@ Kubernetes: `^1.19.0-0` | ingester.​persistentVolume.​size | string | `"2Gi"` | Ingester data Persistent Volume size | | ingester.​persistentVolume.​storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | ingester.​persistentVolume.​subPath | string | `""` | Subdirectory of Ingester data Persistent Volume to mount Useful if the volume's root directory is not empty | -| ingester.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| ingester.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | ingester.​podDisruptionBudget.​maxUnavailable | int | `1` | | | ingester.​podLabels | object | `{}` | Pod Labels | | ingester.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -655,7 +655,7 @@ Kubernetes: `^1.19.0-0` | purger.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | purger.​livenessProbe.​httpGet.​scheme | string | `"HTTP"` | | | purger.​nodeSelector | object | `{}` | | -| purger.​podAnnotations.​"prometheus.​io/port" | string | `"8080"` | | +| purger.​podAnnotations.​"prometheus.​io/port" | string | `"{{ .Values.config.server.http_listen_port }}"` | | | purger.​podAnnotations.​"prometheus.​io/scrape" | string | `"true"` | | | purger.​podLabels | object | `{}` | | | purger.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -710,7 +710,7 @@ Kubernetes: `^1.19.0-0` | querier.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | querier.​nodeSelector | object | `{}` | | | querier.​persistentVolume.​subPath | string | `nil` | | -| querier.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| querier.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | querier.​podDisruptionBudget.​maxUnavailable | string | `"30%"` | | | querier.​podLabels | object | `{}` | Pod Labels | | querier.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -757,7 +757,7 @@ Kubernetes: `^1.19.0-0` | query_frontend.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | query_frontend.​nodeSelector | object | `{}` | | | query_frontend.​persistentVolume.​subPath | string | `nil` | | -| query_frontend.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| query_frontend.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | query_frontend.​podDisruptionBudget.​maxUnavailable | string | `"30%"` | | | query_frontend.​podLabels | object | `{}` | Pod Labels | | query_frontend.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -865,7 +865,7 @@ Kubernetes: `^1.19.0-0` | ruler.​livenessProbe.​httpGet.​path | string | `"/ready"` | | | ruler.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | ruler.​nodeSelector | object | `{}` | | -| ruler.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| ruler.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | ruler.​podDisruptionBudget.​maxUnavailable | string | `"30%"` | | | ruler.​podLabels | object | `{}` | Pod Labels | | ruler.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -957,7 +957,7 @@ Kubernetes: `^1.19.0-0` | store_gateway.​persistentVolume.​size | string | `"2Gi"` | Store-gateway data Persistent Volume size | | store_gateway.​persistentVolume.​storageClass | string | `nil` | Store-gateway data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | store_gateway.​persistentVolume.​subPath | string | `""` | Subdirectory of Store-gateway data Persistent Volume to mount Useful if the volume's root directory is not empty | -| store_gateway.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | +| store_gateway.​podAnnotations | object | `{"prometheus.io/port":"{{ .Values.config.server.http_listen_port }}","prometheus.io/scrape":"true"}` | Pod Annotations | | store_gateway.​podDisruptionBudget.​maxUnavailable | int | `1` | | | store_gateway.​podLabels | object | `{}` | Pod Labels | | store_gateway.​podManagementPolicy | string | `"OrderedReady"` | https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies | diff --git a/templates/alertmanager/alertmanager-dep.yaml b/templates/alertmanager/alertmanager-dep.yaml index 814a811e..16b9ce66 100644 --- a/templates/alertmanager/alertmanager-dep.yaml +++ b/templates/alertmanager/alertmanager-dep.yaml @@ -28,7 +28,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.alertmanager.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.alertmanager.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/alertmanager/alertmanager-statefulset.yaml b/templates/alertmanager/alertmanager-statefulset.yaml index 0861176c..433569e7 100644 --- a/templates/alertmanager/alertmanager-statefulset.yaml +++ b/templates/alertmanager/alertmanager-statefulset.yaml @@ -59,7 +59,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.alertmanager.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.alertmanager.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/compactor/compactor-statefulset.yaml b/templates/compactor/compactor-statefulset.yaml index 1186746f..1aab8e1f 100644 --- a/templates/compactor/compactor-statefulset.yaml +++ b/templates/compactor/compactor-statefulset.yaml @@ -56,7 +56,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.compactor.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.compactor.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/distributor/distributor-dep.yaml b/templates/distributor/distributor-dep.yaml index 82cbed63..0f3d1b54 100644 --- a/templates/distributor/distributor-dep.yaml +++ b/templates/distributor/distributor-dep.yaml @@ -29,7 +29,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.distributor.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.distributor.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/ingester/ingester-dep.yaml b/templates/ingester/ingester-dep.yaml index 564062bd..336779bf 100644 --- a/templates/ingester/ingester-dep.yaml +++ b/templates/ingester/ingester-dep.yaml @@ -32,7 +32,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.ingester.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.ingester.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/ingester/ingester-statefulset.yaml b/templates/ingester/ingester-statefulset.yaml index 8f5fa6da..e2e7b147 100644 --- a/templates/ingester/ingester-statefulset.yaml +++ b/templates/ingester/ingester-statefulset.yaml @@ -83,7 +83,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.ingester.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.ingester.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/nginx/nginx-dep.yaml b/templates/nginx/nginx-dep.yaml index 1c1a7588..303d8de4 100644 --- a/templates/nginx/nginx-dep.yaml +++ b/templates/nginx/nginx-dep.yaml @@ -27,7 +27,7 @@ spec: annotations: checksum/config: {{ include (print $.Template.BasePath "/nginx/nginx-config.yaml") . | sha256sum }} {{- with .Values.nginx.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.nginx.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/overrides-exporter/overrides-exporter-dep.yaml b/templates/overrides-exporter/overrides-exporter-dep.yaml index 4b7b8653..0a1dd40f 100644 --- a/templates/overrides-exporter/overrides-exporter-dep.yaml +++ b/templates/overrides-exporter/overrides-exporter-dep.yaml @@ -29,7 +29,7 @@ spec: checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- end }} {{- with .Values.overrides_exporter.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ template "cortex.serviceAccountName" . }} diff --git a/templates/parquet-converter/parquet-converter-dep.yaml b/templates/parquet-converter/parquet-converter-dep.yaml index b76c8009..de7c56fc 100644 --- a/templates/parquet-converter/parquet-converter-dep.yaml +++ b/templates/parquet-converter/parquet-converter-dep.yaml @@ -29,7 +29,7 @@ spec: checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- end }} {{- with .Values.parquet_converter.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ template "cortex.serviceAccountName" . }} diff --git a/templates/parquet-converter/parquet-converter-statefulset.yaml b/templates/parquet-converter/parquet-converter-statefulset.yaml index 39216346..5034a169 100644 --- a/templates/parquet-converter/parquet-converter-statefulset.yaml +++ b/templates/parquet-converter/parquet-converter-statefulset.yaml @@ -59,7 +59,7 @@ spec: checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- end }} {{- with .Values.parquet_converter.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ template "cortex.serviceAccountName" . }} diff --git a/templates/purger/purger-dep.yaml b/templates/purger/purger-dep.yaml index da0a5669..c64fdf84 100644 --- a/templates/purger/purger-dep.yaml +++ b/templates/purger/purger-dep.yaml @@ -25,7 +25,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.purger.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.purger.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/querier/querier-dep.yaml b/templates/querier/querier-dep.yaml index 18dfb2e4..db8b09a4 100644 --- a/templates/querier/querier-dep.yaml +++ b/templates/querier/querier-dep.yaml @@ -27,7 +27,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.querier.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.querier.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/query-frontend/query-frontend-dep.yaml b/templates/query-frontend/query-frontend-dep.yaml index 4045ea3a..20a8adcc 100644 --- a/templates/query-frontend/query-frontend-dep.yaml +++ b/templates/query-frontend/query-frontend-dep.yaml @@ -25,7 +25,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.query_frontend.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.query_frontend.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/query-scheduler/query-scheduler-dep.yaml b/templates/query-scheduler/query-scheduler-dep.yaml index 805c4159..7eebea4e 100644 --- a/templates/query-scheduler/query-scheduler-dep.yaml +++ b/templates/query-scheduler/query-scheduler-dep.yaml @@ -25,7 +25,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.query_scheduler.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ template "cortex.serviceAccountName" . }} diff --git a/templates/ruler/ruler-dep.yaml b/templates/ruler/ruler-dep.yaml index 9a805c35..ab29f689 100644 --- a/templates/ruler/ruler-dep.yaml +++ b/templates/ruler/ruler-dep.yaml @@ -30,7 +30,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.ruler.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.ruler.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/templates/store-gateway/store-gateway-statefulset.yaml b/templates/store-gateway/store-gateway-statefulset.yaml index 35746d6a..711360ad 100644 --- a/templates/store-gateway/store-gateway-statefulset.yaml +++ b/templates/store-gateway/store-gateway-statefulset.yaml @@ -59,7 +59,7 @@ spec: annotations: checksum/config: {{ include "cortex.configChecksum" . }} {{- with .Values.store_gateway.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} spec: serviceAccountName: {{ .Values.store_gateway.serviceAccount.name | default (include "cortex.serviceAccountName" . ) }} diff --git a/values.yaml b/values.yaml index ed9aeb3a..f6c4bec5 100644 --- a/values.yaml +++ b/values.yaml @@ -205,7 +205,7 @@ alertmanager: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -390,7 +390,7 @@ distributor: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -526,7 +526,7 @@ ingester: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -690,7 +690,7 @@ ruler: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -844,7 +844,7 @@ querier: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -954,7 +954,7 @@ query_frontend: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -1358,7 +1358,7 @@ purger: podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -1586,7 +1586,7 @@ store_gateway: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: [] @@ -1719,7 +1719,7 @@ compactor: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + prometheus.io/port: '{{ .Values.config.server.http_listen_port }}' nodeSelector: {} topologySpreadConstraints: []