Skip to content

Sort node readiness label keys when generating node affinity #3212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuminn-k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sort node readiness label keys when generating node affinity #3212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/cluster/k8sres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,12 @@ func (c *Cluster) nodeAffinity(nodeReadinessLabel map[string]string, nodeAffinit
}
if len(nodeReadinessLabel) > 0 {
matchExpressions := make([]v1.NodeSelectorRequirement, 0)
for k, v := range nodeReadinessLabel {
// sorted keys keep the generated affinity stable between syncs
for _, k := range slices.Sorted(maps.Keys(nodeReadinessLabel)) {
matchExpressions = append(matchExpressions, v1.NodeSelectorRequirement{
Key: k,
Operator: v1.NodeSelectorOpIn,
Values: []string{v},
Values: []string{nodeReadinessLabel[k]},
})
}
nodeReadinessSelectorTerm := v1.NodeSelectorTerm{MatchExpressions: matchExpressions}
Expand Down
24 changes: 24 additions & 0 deletions pkg/cluster/k8sres_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,30 @@ func TestNodeAffinity(t *testing.T) {
assert.Equal(t, s.Spec.Template.Spec.Affinity.NodeAffinity, nodeAff, "cluster template has correct node affinity")
}

func TestNodeAffinityReadinessLabelOrder(t *testing.T) {
cluster := New(Config{}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
nodeReadinessLabel := map[string]string{
"lifecycle-status": "ready",
"nodepool": "platform",
"postgres_ready": "true",
"zone": "a",
}

expected := []v1.NodeSelectorRequirement{
{Key: "lifecycle-status", Operator: v1.NodeSelectorOpIn, Values: []string{"ready"}},
{Key: "nodepool", Operator: v1.NodeSelectorOpIn, Values: []string{"platform"}},
{Key: "postgres_ready", Operator: v1.NodeSelectorOpIn, Values: []string{"true"}},
{Key: "zone", Operator: v1.NodeSelectorOpIn, Values: []string{"a"}},
}

// map iteration order is random, so an unsorted result would differ between syncs
for i := 0; i < 20; i++ {
affinity := cluster.nodeAffinity(nodeReadinessLabel, nil)
terms := affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms
assert.Equal(t, expected, terms[0].MatchExpressions, "node readiness match expressions should be sorted by key")
}
}

func TestPodAffinity(t *testing.T) {
clusterName := "acid-test-cluster"
namespace := "default"
Expand Down
Loading