monitoring: Move to topologySpreadConstraints

monitoring/alertmanager.yaml

@@ -31,6 +31,14 @@ kind: Alertmanager
 metadata:
   name: alertmanager
 spec:
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: topology.kubernetes.io/zone
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app.kubernetes.io/instance: alertmanager
+          app.kubernetes.io/name: alertmanager
   alertmanagerConfigMatcherStrategy:
     type: None
   alertmanagerConfigNamespaceSelector: {}

monitoring/blackbox-exporter.yaml

@@ -188,16 +188,13 @@ spec:
           operator: Equal
           value: monitoring
           effect: NoSchedule
-      affinity:
+      topologySpreadConstraints:
-        podAntiAffinity:
+        - maxSkew: 1
-          requiredDuringSchedulingIgnoredDuringExecution:
+          topologyKey: topology.kubernetes.io/zone
-          - labelSelector:
+          whenUnsatisfiable: DoNotSchedule
-              matchExpressions:
+          labelSelector:
-              - key: app
+            matchLabels:
-                operator: In
+              app: blackbox-exporter
-                values:
-                - blackbox-exporter
-            topologyKey: "kubernetes.io/hostname"
 ---
 kind: Service
 apiVersion: v1

monitoring/mikrotik-exporter.yaml

@@ -77,6 +77,13 @@ spec:
         envFrom:
           - secretRef:
               name: mikrotik-exporter
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: topology.kubernetes.io/zone
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              app: mikrotik-exporter
       nodeSelector:
         dedicated: monitoring
       tolerations:

monitoring/ping-exporter.yaml

@@ -45,16 +45,13 @@ spec:
         operator: Equal
         value: monitoring
         effect: NoSchedule
-      affinity:
+      topologySpreadConstraints:
-        podAntiAffinity:
+        - maxSkew: 1
-          requiredDuringSchedulingIgnoredDuringExecution:
+          topologyKey: topology.kubernetes.io/zone
-          - labelSelector:
+          whenUnsatisfiable: DoNotSchedule
-              matchExpressions:
+          labelSelector:
-              - key: app
+            matchLabels:
-                operator: In
+              app: ping-exporter
-                values:
-                - ping-exporter
-            topologyKey: "kubernetes.io/hostname"
 ---
 kind: Service
 apiVersion: v1

monitoring/prometheus.yaml

@@ -15,6 +15,14 @@ kind: Prometheus
 metadata:
   name: prometheus
 spec:
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: topology.kubernetes.io/zone
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app.kubernetes.io/instance: prometheus
+          app.kubernetes.io/name: prometheus
   nodeSelector:
     dedicated: monitoring
   tolerations:

monitoring/snmp-exporter.yaml

@@ -45,16 +45,13 @@ spec:
         operator: Equal
         value: monitoring
         effect: NoSchedule
-      affinity:
+      topologySpreadConstraints:
-        podAntiAffinity:
+        - maxSkew: 1
-          requiredDuringSchedulingIgnoredDuringExecution:
+          topologyKey: topology.kubernetes.io/zone
-          - labelSelector:
+          whenUnsatisfiable: DoNotSchedule
-              matchExpressions:
+          labelSelector:
-              - key: app
+            matchLabels:
-                operator: In
+              app: snmp-exporter
-                values:
-                - snmp-exporter
-            topologyKey: "kubernetes.io/hostname"
 ---
 kind: Service
 apiVersion: v1