From 0653ac408d380e779dad176daf455f171784572b Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Tue, 18 May 2021 18:20:15 -0400
Subject: [PATCH] Add podAntiAffinity labels to remaining HA control plane pods
 (#5409)

Fixes: #5347

Add podAntiAffinity to eventing-controller, pingsource-mt-adapter and
sugar-controller pods
---
 .../in-memory-channel/deployments/controller.yaml   |  8 ++++++++
 config/core/deployments/pingsource-mt-adapter.yaml  | 13 ++++++++++---
 config/sugar/500-controller.yaml                    |  8 ++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/config/channels/in-memory-channel/deployments/controller.yaml b/config/channels/in-memory-channel/deployments/controller.yaml
index 426d37621bd..10d2e23f5f0 100644
--- a/config/channels/in-memory-channel/deployments/controller.yaml
+++ b/config/channels/in-memory-channel/deployments/controller.yaml
@@ -29,6 +29,14 @@ spec:
     metadata:
       labels: *labels
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels: *labels
+              topologyKey: kubernetes.io/hostname
+            weight: 100
       serviceAccountName: imc-controller
       enableServiceLinks: false
       containers:
diff --git a/config/core/deployments/pingsource-mt-adapter.yaml b/config/core/deployments/pingsource-mt-adapter.yaml
index 3da737d0647..a2506eb8e90 100644
--- a/config/core/deployments/pingsource-mt-adapter.yaml
+++ b/config/core/deployments/pingsource-mt-adapter.yaml
@@ -23,16 +23,23 @@ spec:
   # when set to 0 (and only 0) will be set to 1 when the first PingSource is created.
   replicas: 0
   selector:
-    matchLabels:
+    matchLabels: &labels
       eventing.knative.dev/source: ping-source-controller
       sources.knative.dev/role: adapter
   template:
     metadata:
       labels:
-        eventing.knative.dev/source: ping-source-controller
-        sources.knative.dev/role: adapter
+        <<: *labels
         eventing.knative.dev/release: devel
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels: *labels
+              topologyKey: kubernetes.io/hostname
+            weight: 100
       enableServiceLinks: false
       containers:
         - name: dispatcher
diff --git a/config/sugar/500-controller.yaml b/config/sugar/500-controller.yaml
index f8e13ef4b6c..062056c65c8 100644
--- a/config/sugar/500-controller.yaml
+++ b/config/sugar/500-controller.yaml
@@ -27,6 +27,14 @@ spec:
     metadata:
       labels: *labels
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels: *labels
+              topologyKey: kubernetes.io/hostname
+            weight: 100
       serviceAccountName: eventing-controller
       enableServiceLinks: false
       containers: