Fix default affinity overrides-exporter & improve overrides exporter chart (#557)

friedrichg · web-flow · commit ae81454e024a · 2025-09-02T16:23:51.000-07:00
* Fix default affinity overrides-exporter

Signed-off-by: Friedrich Gonzalez &lt;1517449+friedrichg@users.noreply.github.com&gt;

* fix README

Signed-off-by: Friedrich Gonzalez &lt;1517449+friedrichg@users.noreply.github.com&gt;

* Allow more replicas and pdb

Signed-off-by: Friedrich Gonzalez &lt;1517449+friedrichg@users.noreply.github.com&gt;

---------

Signed-off-by: Friedrich Gonzalez &lt;1517449+friedrichg@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@
 * [CHANGE] Remove startup probes from compactors from default values. It's not recommended in general #542
 * [CHANGE] Use default value for num_tokens in ingester configuration #544
 * [DEPENDENCY] Update kiwigrid/k8s-sidecar docker tag to v1.30.5 #531
-* [BUGFIX] fix discovering memcached instances #551
+* [BUGFIX] Fix discovering memcached instances #551
+* [ENHANCEMENT] Run overrides-exporter with high availability #557
 
 ## 2.6.0 / 2025-05-07
 
diff --git a/README.md b/README.md
@@ -484,7 +484,7 @@ Kubernetes: `^1.19.0-0`
 | nginx.&ZeroWidthSpace;topologySpreadConstraints | list | `[]` |  |
 | overrides_exporter.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;labelSelector.&ZeroWidthSpace;matchExpressions[0].&ZeroWidthSpace;key | string | `"app.kubernetes.io/component"` |  |
 | overrides_exporter.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;labelSelector.&ZeroWidthSpace;matchExpressions[0].&ZeroWidthSpace;operator | string | `"In"` |  |
-| overrides_exporter.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;labelSelector.&ZeroWidthSpace;matchExpressions[0].&ZeroWidthSpace;values[0] | string | `"query-scheduler"` |  |
+| overrides_exporter.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;labelSelector.&ZeroWidthSpace;matchExpressions[0].&ZeroWidthSpace;values[0] | string | `"overrides-exporter"` |  |
 | overrides_exporter.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;topologyKey | string | `"kubernetes.io/hostname"` |  |
 | overrides_exporter.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;weight | int | `100` |  |
 | overrides_exporter.&ZeroWidthSpace;annotations | object | `{}` |  |
@@ -503,9 +503,11 @@ Kubernetes: `^1.19.0-0`
 | overrides_exporter.&ZeroWidthSpace;livenessProbe.&ZeroWidthSpace;httpGet.&ZeroWidthSpace;port | string | `"http-metrics"` |  |
 | overrides_exporter.&ZeroWidthSpace;nodeSelector | object | `{}` |  |
 | overrides_exporter.&ZeroWidthSpace;podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations |
+| overrides_exporter.&ZeroWidthSpace;podDisruptionBudget.&ZeroWidthSpace;maxUnavailable | string | `"30%"` |  |
 | overrides_exporter.&ZeroWidthSpace;podLabels | object | `{}` | Pod Labels |
 | overrides_exporter.&ZeroWidthSpace;readinessProbe.&ZeroWidthSpace;httpGet.&ZeroWidthSpace;path | string | `"/ready"` |  |
 | overrides_exporter.&ZeroWidthSpace;readinessProbe.&ZeroWidthSpace;httpGet.&ZeroWidthSpace;port | string | `"http-metrics"` |  |
+| overrides_exporter.&ZeroWidthSpace;replicas | int | `1` |  |
 | overrides_exporter.&ZeroWidthSpace;resources | object | `{}` |  |
 | overrides_exporter.&ZeroWidthSpace;securityContext | object | `{}` |  |
 | overrides_exporter.&ZeroWidthSpace;service.&ZeroWidthSpace;annotations | object | `{}` |  |
diff --git a/templates/overrides-exporter/overrides-exporter-dep.yaml b/templates/overrides-exporter/overrides-exporter-dep.yaml
@@ -9,7 +9,7 @@ metadata:
   annotations:
     {{- toYaml .Values.overrides_exporter.annotations | nindent 4 }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.overrides_exporter.replicas }}
   selector:
     matchLabels:
       {{- include "cortex.overridesExporterSelectorLabels" . | nindent 6 }}
diff --git a/templates/overrides-exporter/overrides-exporter-poddisruptionbudget.yaml b/templates/overrides-exporter/overrides-exporter-poddisruptionbudget.yaml
@@ -0,0 +1,14 @@
+{{- if and (gt (int .Values.overrides_exporter.replicas) 1) (.Values.overrides_exporter.podDisruptionBudget) (.Values.overrides_exporter.enabled) }}
+apiVersion: {{ include "cortex.pdbVersion" . }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "cortex.overridesExporterFullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cortex.overridesExporterLabels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "cortex.overridesExporterSelectorLabels" . | nindent 6 }}
+  {{- toYaml .Values.overrides_exporter.podDisruptionBudget | nindent 2 }}
+{{- end }}
diff --git a/values.yaml b/values.yaml
@@ -1029,6 +1029,7 @@ query_scheduler:
 overrides_exporter:
   # -- https://cortexmetrics.io/docs/guides/overrides-exporter/
   enabled: false
+  replicas: 1
 
   service:
     annotations: {}
@@ -1068,7 +1069,7 @@ overrides_exporter:
                 - key: app.kubernetes.io/component
                   operator: In
                   values:
-                    - query-scheduler
+                    - overrides-exporter
             topologyKey: 'kubernetes.io/hostname'
 
   annotations: {}
@@ -1102,6 +1103,9 @@ overrides_exporter:
 
   tolerations: []
 
+  podDisruptionBudget:
+    maxUnavailable: 30%
+
   initContainers: []
   extraContainers: []
   extraVolumes: []
