From a168cf3d6fb7e2af02120455ae5a2220b2a635b3 Mon Sep 17 00:00:00 2001 From: David Ortiz Date: Fri, 29 Jul 2022 11:46:04 +0200 Subject: [PATCH] [component/clusteragent] Change anti-affinity to "preferred" --- controllers/datadogagent/clusteragent_test.go | 13 ++++++++----- .../datadogagent/component/clusteragent/default.go | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/controllers/datadogagent/clusteragent_test.go b/controllers/datadogagent/clusteragent_test.go index faea7fe94..75ce2951e 100644 --- a/controllers/datadogagent/clusteragent_test.go +++ b/controllers/datadogagent/clusteragent_test.go @@ -1540,14 +1540,17 @@ func Test_PodAntiAffinity(t *testing.T) { affinity: nil, want: &v1.Affinity{ PodAntiAffinity: &v1.PodAntiAffinity{ - RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{ + PreferredDuringSchedulingIgnoredDuringExecution: []corev1.WeightedPodAffinityTerm{ { - LabelSelector: &metav1.LabelSelector{ - MatchLabels: map[string]string{ - "agent.datadoghq.com/component": "cluster-agent", + Weight: 50, + PodAffinityTerm: corev1.PodAffinityTerm{ + LabelSelector: &metav1.LabelSelector{ + MatchLabels: map[string]string{ + apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + }, }, + TopologyKey: "kubernetes.io/hostname", }, - TopologyKey: "kubernetes.io/hostname", }, }, }, diff --git a/controllers/datadogagent/component/clusteragent/default.go b/controllers/datadogagent/component/clusteragent/default.go index b0abc8560..eaecccb2a 100644 --- a/controllers/datadogagent/component/clusteragent/default.go +++ b/controllers/datadogagent/component/clusteragent/default.go @@ -143,14 +143,17 @@ func defaultEnvVars(dda metav1.Object) []corev1.EnvVar { func DefaultAffinity() *corev1.Affinity { return &corev1.Affinity{ PodAntiAffinity: &corev1.PodAntiAffinity{ - RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{ + PreferredDuringSchedulingIgnoredDuringExecution: []corev1.WeightedPodAffinityTerm{ { - LabelSelector: &metav1.LabelSelector{ - MatchLabels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + Weight: 50, + PodAffinityTerm: corev1.PodAffinityTerm{ + LabelSelector: &metav1.LabelSelector{ + MatchLabels: map[string]string{ + apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + }, }, + TopologyKey: "kubernetes.io/hostname", }, - TopologyKey: "kubernetes.io/hostname", }, }, },