Do not render empty pod affinity info

manadart · Apr 22, 2024 · 0151936 · 0151936
1 parent 405bb6b
commit 0151936
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/caas/kubernetes/provider/application/constraints.go b/caas/kubernetes/provider/application/constraints.go
@@ -159,13 +159,15 @@ func processNodeAffinity(pod *core.PodSpec, affinityLabels map[string]string) er
 	}
 	var nodeSelectorTerm core.NodeSelectorTerm
 	updateSelectorTerms(&nodeSelectorTerm, affinityTags)
-	if pod.Affinity == nil {
-		pod.Affinity = &core.Affinity{}
-	}
-	pod.Affinity.NodeAffinity = &core.NodeAffinity{
-		RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
-			NodeSelectorTerms: []core.NodeSelectorTerm{nodeSelectorTerm},
-		},
+	if len(nodeSelectorTerm.MatchExpressions) > 0 {
+		if pod.Affinity == nil {
+			pod.Affinity = &core.Affinity{}
+		}
+		pod.Affinity.NodeAffinity = &core.NodeAffinity{
+			RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
+				NodeSelectorTerms: []core.NodeSelectorTerm{nodeSelectorTerm},
+			},
+		}
 	}
 	return nil
 }
@@ -240,12 +242,12 @@ func processPodAffinity(pod *core.PodSpec, affinityLabels map[string]string) err
 			affinityTerm.TopologyKey = topologyKey
 		}
 	}
-	if pod.Affinity == nil {
-		pod.Affinity = &core.Affinity{}
-	}
 	var affinityTerm core.PodAffinityTerm
 	updateAffinityTerm(&affinityTerm, affinityTags)
 	if len(affinityTerm.LabelSelector.MatchExpressions) > 0 || affinityTerm.TopologyKey != "" {
+		if pod.Affinity == nil {
+			pod.Affinity = &core.Affinity{}
+		}
 		pod.Affinity.PodAffinity = &core.PodAffinity{
 			RequiredDuringSchedulingIgnoredDuringExecution: []core.PodAffinityTerm{affinityTerm},
 		}
@@ -254,6 +256,9 @@ func processPodAffinity(pod *core.PodSpec, affinityLabels map[string]string) err
 	var antiAffinityTerm core.PodAffinityTerm
 	updateAffinityTerm(&antiAffinityTerm, antiAffinityTags)
 	if len(antiAffinityTerm.LabelSelector.MatchExpressions) > 0 || antiAffinityTerm.TopologyKey != "" {
+		if pod.Affinity == nil {
+			pod.Affinity = &core.Affinity{}
+		}
 		pod.Affinity.PodAntiAffinity = &core.PodAntiAffinity{
 			RequiredDuringSchedulingIgnoredDuringExecution: []core.PodAffinityTerm{antiAffinityTerm},
 		}

diff --git a/caas/kubernetes/provider/application/constraints_test.go b/caas/kubernetes/provider/application/constraints_test.go
@@ -69,6 +69,8 @@ func (s *applyConstraintsSuite) TestPodAffinityJustTopologyKey(c *gc.C) {
 			TopologyKey:   "foo",
 		}},
 	})
+	c.Assert(pod.Affinity.PodAntiAffinity, gc.IsNil)
+	c.Assert(pod.Affinity.NodeAffinity, gc.IsNil)
 }
 
 func (s *applyConstraintsSuite) TestAffinityPod(c *gc.C) {
@@ -94,6 +96,8 @@ func (s *applyConstraintsSuite) TestAffinityPod(c *gc.C) {
 			},
 		}},
 	})
+	c.Assert(pod.Affinity.PodAntiAffinity, gc.IsNil)
+	c.Assert(pod.Affinity.NodeAffinity, gc.IsNil)
 }
 
 func (s *applyConstraintsSuite) TestPodAffinityAll(c *gc.C) {
@@ -135,6 +139,8 @@ func (s *applyConstraintsSuite) TestAntiPodAffinityJustTopologyKey(c *gc.C) {
 			TopologyKey:   "foo",
 		}},
 	})
+	c.Assert(pod.Affinity.PodAffinity, gc.IsNil)
+	c.Assert(pod.Affinity.NodeAffinity, gc.IsNil)
 }
 
 func (s *applyConstraintsSuite) TestAntiPodAffinity(c *gc.C) {
@@ -160,6 +166,8 @@ func (s *applyConstraintsSuite) TestAntiPodAffinity(c *gc.C) {
 			},
 		}},
 	})
+	c.Assert(pod.Affinity.PodAffinity, gc.IsNil)
+	c.Assert(pod.Affinity.NodeAffinity, gc.IsNil)
 }
 
 func (s *applyConstraintsSuite) TestAntiPodAffinityAll(c *gc.C) {
@@ -186,6 +194,8 @@ func (s *applyConstraintsSuite) TestAntiPodAffinityAll(c *gc.C) {
 			TopologyKey: "foo",
 		}},
 	})
+	c.Assert(pod.Affinity.PodAffinity, gc.IsNil)
+	c.Assert(pod.Affinity.NodeAffinity, gc.IsNil)
 }
 
 func (s *applyConstraintsSuite) TestNodeAntiAffinity(c *gc.C) {
@@ -210,4 +220,6 @@ func (s *applyConstraintsSuite) TestNodeAntiAffinity(c *gc.C) {
 			}},
 		},
 	})
+	c.Assert(pod.Affinity.PodAffinity, gc.IsNil)
+	c.Assert(pod.Affinity.PodAntiAffinity, gc.IsNil)
 }