updated pod anti affinity for agent pods (#264)

cloud-bulldozer · Nov 14, 2022 · 325de1d · 325de1d
1 parent b672085
commit 325de1d
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/dags/openshift_nightlies/scripts/utils/templates/grafana-agent-hypershift.yaml b/dags/openshift_nightlies/scripts/utils/templates/grafana-agent-hypershift.yaml
@@ -1,3 +1,19 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: user-workload-monitoring-config
+  namespace: openshift-user-workload-monitoring
+data:
+  config.yaml: >
+    prometheus:
+      nodeSelector:
+        node-role.kubernetes.io/workload: ""
+      tolerations:
+        - effect: NoSchedule
+          key: role
+          value: workload
+---
 apiVersion: v1                                                                                                                                                                                                                               
 kind: Namespace                                                                                                                                                                                                                              
 metadata:                                                                                                                                                                                                                                                                                                                                                                                                                                         
@@ -71,6 +87,17 @@ spec:
               matchExpressions:
               - key: node-role.kubernetes.io/workload
                 operator: Exists
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels:
+                app.kubernetes.io/component: prometheus
+                app.kubernetes.io/instance: user-workload
+                app.kubernetes.io/name: prometheus
+                app.kubernetes.io/part-of: openshift-monitoring
+            namespaces:
+            - openshift-user-workload-monitoring
+            topologyKey: kubernetes.io/hostname
       tolerations:
       - key: role
         value: workload
@@ -152,18 +179,3 @@ data:
               tls_config:
                 insecure_skip_verify: true
 
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: user-workload-monitoring-config
-  namespace: openshift-user-workload-monitoring
-data:
-  config.yaml: >
-    prometheus:
-      nodeSelector:
-        node-role.kubernetes.io/workload: ""
-      tolerations:
-        - effect: NoSchedule
-          key: role
-          value: workload