Label hint

If the user wants to provide hints to help schedule the client and
server on specific nodes, they can add `netperf=true` label to the nodes
they want tested.

Signed-off-by: Joe Talerico aka rook <joe.talerico@gmail.com>

README.md

@@ -35,6 +35,16 @@ $ cd k8s-netperf
 $ make container-build
 ```
 
+## Label nodes
+k8s-netperf will make the best decision it can to schedule the client and server in your cluster. However,
+you can provide hints to ensure the client and server will always land on specific nodes.
+
+To do this, apply a label to the nodes you want the client and server running
+
+```shell
+$ oc label nodes node-name netperf=true
+```
+
 ## Running with Pods
 Ensure your `kubeconfig` is properly set to the cluster you would like to run `k8s-netperf` against.
 

pkg/k8s/kubernetes.go

@@ -342,6 +342,21 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 				RequiredDuringSchedulingIgnoredDuringExecution: workerNodeSelectorExpression,
 			}
 		}
+	} else {
+		affinity := corev1.NodeAffinity{
+			PreferredDuringSchedulingIgnoredDuringExecution: []corev1.PreferredSchedulingTerm{
+				{
+					Weight: 100,
+					Preference: corev1.NodeSelectorTerm{
+						MatchExpressions: []corev1.NodeSelectorRequirement{
+							{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"true"}},
+						},
+					},
+				},
+			},
+		}
+		cdpAcross.NodeAffinity = affinity
+		cdpHostAcross.NodeAffinity = affinity
 	}
 
 	if ncount > 1 {
@@ -427,6 +442,21 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 		}
 		sdp.NodeAffinity = affinity
 		sdpHost.NodeAffinity = affinity
+	} else {
+		affinity := corev1.NodeAffinity{
+			PreferredDuringSchedulingIgnoredDuringExecution: []corev1.PreferredSchedulingTerm{
+				{
+					Weight: 100,
+					Preference: corev1.NodeSelectorTerm{
+						MatchExpressions: []corev1.NodeSelectorRequirement{
+							{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"true"}},
+						},
+					},
+				},
+			},
+		}
+		sdp.NodeAffinity = affinity
+		sdpHost.NodeAffinity = affinity
 	}
 	if ncount > 1 {
 		antiAffinity := corev1.PodAntiAffinity{
@@ -583,6 +613,7 @@ func zoneNodeSelectorExpression(zone string) []corev1.PreferredSchedulingTerm {
 			Preference: corev1.NodeSelectorTerm{
 				MatchExpressions: []corev1.NodeSelectorRequirement{
 					{Key: "topology.kubernetes.io/zone", Operator: corev1.NodeSelectorOpIn, Values: []string{zone}},
+					{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"true"}},
 				},
 			},
 		},