From bdf6e394d234e8ceb24122c8ea4d03dbd9ffa032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20=C5=A0imon?= <ksimon@redhat.com>
Date: Thu, 11 Apr 2019 09:48:45 +0200
Subject: [PATCH] changed pod anti affinity scheduling rule

---
 manifests/generated/virt-api.yaml.in          | 18 ++++++++++--------
 manifests/generated/virt-controller.yaml.in   | 18 ++++++++++--------
 .../creation/components/deployments.go        | 19 +++++++++++--------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/manifests/generated/virt-api.yaml.in b/manifests/generated/virt-api.yaml.in
index ac29b782baac..ecaaa132668e 100644
--- a/manifests/generated/virt-api.yaml.in
+++ b/manifests/generated/virt-api.yaml.in
@@ -40,14 +40,16 @@ spec:
     spec:
       affinity:
         podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: kubevirt.io
-                operator: In
-                values:
-                - virt-api
-            topologyKey: kubernetes.io/hostname
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: kubevirt.io
+                  operator: In
+                  values:
+                  - virt-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
       - command:
         - virt-api
diff --git a/manifests/generated/virt-controller.yaml.in b/manifests/generated/virt-controller.yaml.in
index 1186b5fa4249..e9eccc76600c 100644
--- a/manifests/generated/virt-controller.yaml.in
+++ b/manifests/generated/virt-controller.yaml.in
@@ -24,14 +24,16 @@ spec:
     spec:
       affinity:
         podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: kubevirt.io
-                operator: In
-                values:
-                - virt-controller
-            topologyKey: kubernetes.io/hostname
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: kubevirt.io
+                  operator: In
+                  values:
+                  - virt-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
       - command:
         - virt-controller
diff --git a/pkg/virt-operator/creation/components/deployments.go b/pkg/virt-operator/creation/components/deployments.go
index 19891f2f44a2..151d915af599 100644
--- a/pkg/virt-operator/creation/components/deployments.go
+++ b/pkg/virt-operator/creation/components/deployments.go
@@ -246,18 +246,21 @@ func newBaseDeployment(name string, namespace string, repository string, version
 func newPodAntiAffinity(key, topologyKey string, operator metav1.LabelSelectorOperator, values []string) *corev1.Affinity {
 	return &corev1.Affinity{
 		PodAntiAffinity: &corev1.PodAntiAffinity{
-			RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
+			PreferredDuringSchedulingIgnoredDuringExecution: []corev1.WeightedPodAffinityTerm{
 				{
-					LabelSelector: &metav1.LabelSelector{
-						MatchExpressions: []metav1.LabelSelectorRequirement{
-							{
-								Key:      key,
-								Operator: operator,
-								Values:   values,
+					Weight: 1,
+					PodAffinityTerm: corev1.PodAffinityTerm{
+						LabelSelector: &metav1.LabelSelector{
+							MatchExpressions: []metav1.LabelSelectorRequirement{
+								{
+									Key:      key,
+									Operator: operator,
+									Values:   values,
+								},
 							},
 						},
+						TopologyKey: topologyKey,
 					},
-					TopologyKey: topologyKey,
 				},
 			},
 		},