helm: fix broken topology spread constraints in metamonitoring's Graf…

…anaAgent (#9669) * helm: fix indentation in metamonitoring's topologySpreadConstraints * rebuild assets * update CHANGELOG Signed-off-by: Vladimir Varankin <[email protected]> (cherry picked from commit 0d3f52f)
grafana · Oct 18, 2024 · 5f42d8d · 5f42d8d
1 parent 06e4a79
commit 5f42d8d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -29,6 +29,10 @@ Entries should include a reference to the Pull Request that introduced the chang
 
 ## main / unreleased
 
+## 5.5.1
+
+* [BUGFIX] Fix incorrect use of topology spread constraints in `GrafanaAgent` CRD of metamonitoring. #9669
+
 ## 5.5.0
 
 * [ENHANCEMENT] Dashboards: allow switching between using classic or native histograms in dashboards.

diff --git a/operations/helm/charts/mimir-distributed/templates/metamonitoring/grafana-agent.yaml b/operations/helm/charts/mimir-distributed/templates/metamonitoring/grafana-agent.yaml
@@ -64,7 +64,7 @@ spec:
   tolerations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- include "mimir.lib.topologySpreadConstraints" (dict "ctx" $ "component" "meta-monitoring") | nindent 6 }}
+  {{- include "mimir.lib.topologySpreadConstraints" (dict "ctx" $ "component" "meta-monitoring") | nindent 2 }}
   logs:
     instanceSelector:
       matchLabels:

diff --git a/...monitoring-values-generated/mimir-distributed/templates/metamonitoring/grafana-agent.yaml b/...monitoring-values-generated/mimir-distributed/templates/metamonitoring/grafana-agent.yaml
@@ -16,15 +16,15 @@ spec:
     # The container specs here are merged with the ones in the operator using a strategic merge patch.
     - name: config-reloader
     - name: grafana-agent
-      topologySpreadConstraints:
-      - maxSkew: 1
-        topologyKey: kubernetes.io/hostname
-        whenUnsatisfiable: ScheduleAnyway
-        labelSelector:
-          matchLabels:
-            app.kubernetes.io/name: mimir
-            app.kubernetes.io/instance: metamonitoring-values
-            app.kubernetes.io/component: meta-monitoring
+  topologySpreadConstraints:
+  - maxSkew: 1
+    topologyKey: kubernetes.io/hostname
+    whenUnsatisfiable: ScheduleAnyway
+    labelSelector:
+      matchLabels:
+        app.kubernetes.io/name: mimir
+        app.kubernetes.io/instance: metamonitoring-values
+        app.kubernetes.io/component: meta-monitoring
   logs:
     instanceSelector:
       matchLabels: