Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
friedrichg merged 3 commits into from
Sep 2, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cddac59
Fix default affinity overrides-exporter
friedrichg Sep 2, 2025
434134a
fix README
friedrichg Sep 2, 2025
86f4e5f
Allow more replicas and pdb
friedrichg Sep 2, 2025
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ Kubernetes: `^1.19.0-0`
| nginx.​topologySpreadConstraints | list | `[]` | |
| overrides_exporter.​affinity.​podAntiAffinity.​preferredDuringSchedulingIgnoredDuringExecution[0].​podAffinityTerm.​labelSelector.​matchExpressions[0].​key | string | `"app.kubernetes.io/component"` | |
| overrides_exporter.​affinity.​podAntiAffinity.​preferredDuringSchedulingIgnoredDuringExecution[0].​podAffinityTerm.​labelSelector.​matchExpressions[0].​operator | string | `"In"` | |
| overrides_exporter.​affinity.​podAntiAffinity.​preferredDuringSchedulingIgnoredDuringExecution[0].​podAffinityTerm.​labelSelector.​matchExpressions[0].​values[0] | string | `"query-scheduler"` | |
| overrides_exporter.​affinity.​podAntiAffinity.​preferredDuringSchedulingIgnoredDuringExecution[0].​podAffinityTerm.​labelSelector.​matchExpressions[0].​values[0] | string | `"overrides-exporter"` | |
| overrides_exporter.​affinity.​podAntiAffinity.​preferredDuringSchedulingIgnoredDuringExecution[0].​podAffinityTerm.​topologyKey | string | `"kubernetes.io/hostname"` | |
| overrides_exporter.​affinity.​podAntiAffinity.​preferredDuringSchedulingIgnoredDuringExecution[0].​weight | int | `100` | |
| overrides_exporter.​annotations | object | `{}` | |
Expand All @@ -503,9 +503,11 @@ Kubernetes: `^1.19.0-0`
| overrides_exporter.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | |
| overrides_exporter.​nodeSelector | object | `{}` | |
| overrides_exporter.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations |
| overrides_exporter.​podDisruptionBudget.​maxUnavailable | string | `"30%"` | |
| overrides_exporter.​podLabels | object | `{}` | Pod Labels |
| overrides_exporter.​readinessProbe.​httpGet.​path | string | `"/ready"` | |
| overrides_exporter.​readinessProbe.​httpGet.​port | string | `"http-metrics"` | |
| overrides_exporter.​replicas | int | `1` | |
| overrides_exporter.​resources | object | `{}` | |
| overrides_exporter.​securityContext | object | `{}` | |
| overrides_exporter.​service.​annotations | object | `{}` | |
Expand Down
2 changes: 1 addition & 1 deletion templates/overrides-exporter/overrides-exporter-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
14 changes: 14 additions & 0 deletions templates/overrides-exporter/overrides-exporter-poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
6 changes: 5 additions & 1 deletion values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@ query_scheduler:
overrides_exporter:
# -- https://cortexmetrics.io/docs/guides/overrides-exporter/
enabled: false
replicas: 1

service:
annotations: {}
Expand Down Expand Up @@ -1068,7 +1069,7 @@ overrides_exporter:
- key: app.kubernetes.io/component
operator: In
values:
- query-scheduler
- overrides-exporter

@kd7lxl kd7lxl Sep 2, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since overrides-exporter is a singleton, there's so sense in setting anti-affinity with itself. It would make more sense to default to empty affinity, affinity: {}

@friedrichg friedrichg Sep 2, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a singleton means I can lose metrics if the component is getting rescheduled. I can't afford that

topologyKey: 'kubernetes.io/hostname'

annotations: {}
Expand Down Expand Up @@ -1102,6 +1103,9 @@ overrides_exporter:

tolerations: []

podDisruptionBudget:
maxUnavailable: 30%

initContainers: []
extraContainers: []
extraVolumes: []
Expand Down