Skip to content

Commit

Permalink
Fix constaints processing on k8s
Browse files Browse the repository at this point in the history 
to handle case where just topology-key is specfied without any other label selection terms
  • Loading branch information
@wallyworld
wallyworld committed Nov 27, 2023
1 parent dc94b09 commit 0f507dc
Show file tree
Hide file tree
Showing 2 changed files with 215 additions and 2 deletions.
4 changes: 2 additions & 2 deletions caas/kubernetes/provider/application/constraints.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,15 @@ func processPodAffinity(pod *core.PodSpec, affinityLabels map[string]string) err
}
var affinityTerm core.PodAffinityTerm
updateAffinityTerm(&affinityTerm, affinityTags)
if len(affinityTerm.LabelSelector.MatchExpressions) > 0 {
if len(affinityTerm.LabelSelector.MatchExpressions) > 0 || affinityTerm.TopologyKey != "" {
pod.Affinity.PodAffinity = &core.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []core.PodAffinityTerm{affinityTerm},
}
}

var antiAffinityTerm core.PodAffinityTerm
updateAffinityTerm(&antiAffinityTerm, antiAffinityTags)
if len(antiAffinityTerm.LabelSelector.MatchExpressions) > 0 {
if len(antiAffinityTerm.LabelSelector.MatchExpressions) > 0 || antiAffinityTerm.TopologyKey != "" {
pod.Affinity.PodAntiAffinity = &core.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []core.PodAffinityTerm{antiAffinityTerm},
}
Expand Down
213 changes: 213 additions & 0 deletions caas/kubernetes/provider/application/constraints_test.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
// Copyright 2023 Canonical Ltd.
// Licensed under the AGPLv3, see LICENCE file for details.

package application_test

import (
"errors"

jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/juju/juju/caas/kubernetes/provider/application"
"github.com/juju/juju/core/constraints"
"github.com/juju/juju/testing"
)

type applyConstraintsSuite struct {
testing.BaseSuite
}

var _ = gc.Suite(&applyConstraintsSuite{})

func (s *applyConstraintsSuite) TestMemory(c *gc.C) {
pod := &corev1.PodSpec{}
configureConstraint := func(got *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
c.Assert(got, gc.Equals, pod)
c.Assert(resourceName, gc.Equals, corev1.ResourceName("memory"))
c.Assert(value, gc.Equals, "4096Mi")
return errors.New("boom")
}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("mem=4G"), configureConstraint)
c.Assert(err, gc.ErrorMatches, "configuring memory constraint for foo: boom")
}

func (s *applyConstraintsSuite) TestCPU(c *gc.C) {
pod := &corev1.PodSpec{}
configureConstraint := func(got *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
c.Assert(got, gc.Equals, pod)
c.Assert(resourceName, gc.Equals, corev1.ResourceName("cpu"))
c.Assert(value, gc.Equals, "2m")
return errors.New("boom")
}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("cpu-power=2"), configureConstraint)
c.Assert(err, gc.ErrorMatches, "configuring cpu constraint for foo: boom")
}

func (s *applyConstraintsSuite) TestArch(c *gc.C) {
configureConstraint := func(got *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("arch=arm64"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.NodeSelector, jc.DeepEquals, map[string]string{"kubernetes.io/arch": "arm64"})
}

func (s *applyConstraintsSuite) TestPodAffinityJustTopologyKey(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=pod.topology-key=foo"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.PodAffinity, jc.DeepEquals, &corev1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
LabelSelector: &metav1.LabelSelector{},
TopologyKey: "foo",
}},
})
}

func (s *applyConstraintsSuite) TestAffinityPod(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=pod.hello=world|universe,pod.^goodbye=world"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.PodAffinity, jc.DeepEquals, &corev1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
LabelSelector: &metav1.LabelSelector{
MatchLabels: nil,
MatchExpressions: []metav1.LabelSelectorRequirement{{
Key: "goodbye",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"world"},
}, {
Key: "hello",
Operator: metav1.LabelSelectorOpIn,
Values: []string{"world", "universe"},
}},
},
}},
})
}

func (s *applyConstraintsSuite) TestPodAffinityAll(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=pod.hello=world,pod.^goodbye=world,pod.topology-key=foo"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.PodAffinity, jc.DeepEquals, &corev1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
LabelSelector: &metav1.LabelSelector{
MatchLabels: nil,
MatchExpressions: []metav1.LabelSelectorRequirement{{
Key: "goodbye",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"world"},
}, {
Key: "hello",
Operator: metav1.LabelSelectorOpIn,
Values: []string{"world"},
}},
},
TopologyKey: "foo",
}},
})
}

func (s *applyConstraintsSuite) TestAntiPodAffinityJustTopologyKey(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=anti-pod.topology-key=foo"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.PodAntiAffinity, jc.DeepEquals, &corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
LabelSelector: &metav1.LabelSelector{},
TopologyKey: "foo",
}},
})
}

func (s *applyConstraintsSuite) TestAntiPodAffinity(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=anti-pod.hello=world|universe,anti-pod.^goodbye=world"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.PodAntiAffinity, jc.DeepEquals, &corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
LabelSelector: &metav1.LabelSelector{
MatchLabels: nil,
MatchExpressions: []metav1.LabelSelectorRequirement{{
Key: "goodbye",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"world"},
}, {
Key: "hello",
Operator: metav1.LabelSelectorOpIn,
Values: []string{"world", "universe"},
}},
},
}},
})
}

func (s *applyConstraintsSuite) TestAntiPodAffinityAll(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=anti-pod.hello=world,anti-pod.^goodbye=world,anti-pod.topology-key=foo"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.PodAntiAffinity, jc.DeepEquals, &corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
LabelSelector: &metav1.LabelSelector{
MatchLabels: nil,
MatchExpressions: []metav1.LabelSelectorRequirement{{
Key: "goodbye",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"world"},
}, {
Key: "hello",
Operator: metav1.LabelSelectorOpIn,
Values: []string{"world"},
}},
},
TopologyKey: "foo",
}},
})
}

func (s *applyConstraintsSuite) TestNodeAntiAffinity(c *gc.C) {
configureConstraint := func(pod *corev1.PodSpec, resourceName corev1.ResourceName, value string) (err error) {
return errors.New("unexpected")
}
pod := &corev1.PodSpec{}
err := application.ApplyConstraints(pod, "foo", constraints.MustParse("tags=node.hello=world|universe,node.^goodbye=world"), configureConstraint)
c.Assert(err, jc.ErrorIsNil)
c.Assert(pod.Affinity.NodeAffinity, jc.DeepEquals, &corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
NodeSelectorTerms: []corev1.NodeSelectorTerm{{
MatchExpressions: []corev1.NodeSelectorRequirement{{
Key: "goodbye",
Operator: corev1.NodeSelectorOpNotIn,
Values: []string{"world"},
}, {
Key: "hello",
Operator: corev1.NodeSelectorOpIn,
Values: []string{"world", "universe"},
}},
}},
},
})
}

0 comments on commit 0f507dc

Please sign in to comment.