Skip to content

Commit bbb6e12

Browse files
jtalericmohit-sheth
authored andcommitted
Hint ordering matters
Fixing hints Signed-off-by: Joe Talerico aka rook <[email protected]>
1 parent 2a358cf commit bbb6e12

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

pkg/k8s/kubernetes.go

+14-1
Original file line numberDiff line numberDiff line change
@@ -718,15 +718,28 @@ func launchClientVM(perf *config.PerfScenarios, name string, podAff *corev1.PodA
718718
}
719719

720720
func zoneNodeSelectorExpression(zone string, role string) []corev1.PreferredSchedulingTerm {
721+
if zone != "" {
722+
return []corev1.PreferredSchedulingTerm{
723+
{
724+
Weight: 100,
725+
Preference: corev1.NodeSelectorTerm{
726+
MatchExpressions: []corev1.NodeSelectorRequirement{
727+
{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{role}},
728+
{Key: "topology.kubernetes.io/zone", Operator: corev1.NodeSelectorOpIn, Values: []string{zone}},
729+
},
730+
},
731+
},
732+
}
733+
}
721734
return []corev1.PreferredSchedulingTerm{
722735
{
723736
Weight: 100,
724737
Preference: corev1.NodeSelectorTerm{
725738
MatchExpressions: []corev1.NodeSelectorRequirement{
726-
{Key: "topology.kubernetes.io/zone", Operator: corev1.NodeSelectorOpIn, Values: []string{zone}},
727739
{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{role}},
728740
},
729741
},
742+
730743
},
731744
}
732745
}

0 commit comments

Comments
 (0)