Modifying label

Allow the user to pick the server and client hosts individually. Signed-off-by: Joe Talerico aka rook <[email protected]>
cloud-bulldozer · Jan 10, 2025 · 75fcc0e · 75fcc0e
1 parent 11888db
commit 75fcc0e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -37,12 +37,13 @@ $ 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.
+you can provide hints to ensure the client and server lands 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
+$ oc label nodes node-name netperf=client
+$ oc label nodes node-name netperf=server
 ```
 
 ## Running with Pods

diff --git a/pkg/k8s/kubernetes.go b/pkg/k8s/kubernetes.go
@@ -248,7 +248,7 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 		}
 		if z != "" && numNodes > 1 {
 			cdp.NodeAffinity = corev1.NodeAffinity{
-				PreferredDuringSchedulingIgnoredDuringExecution: zoneNodeSelectorExpression(z),
+				PreferredDuringSchedulingIgnoredDuringExecution: zoneNodeSelectorExpression(z, "client"),
 			}
 		}
 
@@ -334,7 +334,7 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 	if z != "" {
 		if numNodes > 1 {
 			cdpAcross.NodeAffinity = corev1.NodeAffinity{
-				PreferredDuringSchedulingIgnoredDuringExecution: zoneNodeSelectorExpression(z),
+				PreferredDuringSchedulingIgnoredDuringExecution: zoneNodeSelectorExpression(z, "client"),
 				RequiredDuringSchedulingIgnoredDuringExecution:  workerNodeSelectorExpression,
 			}
 		} else {
@@ -349,7 +349,7 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 					Weight: 100,
 					Preference: corev1.NodeSelectorTerm{
 						MatchExpressions: []corev1.NodeSelectorRequirement{
-							{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"true"}},
+							{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"client"}},
 						},
 					},
 				},
@@ -362,7 +362,7 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 	if ncount > 1 {
 		if s.HostNetwork {
 			cdpHostAcross.NodeAffinity = corev1.NodeAffinity{
-				PreferredDuringSchedulingIgnoredDuringExecution: zoneNodeSelectorExpression(z),
+				PreferredDuringSchedulingIgnoredDuringExecution: zoneNodeSelectorExpression(z, "client"),
 				RequiredDuringSchedulingIgnoredDuringExecution:  workerNodeSelectorExpression,
 			}
 			cdpHostAcross.PodAntiAffinity = corev1.PodAntiAffinity{
@@ -427,9 +427,9 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 	if z != "" {
 		var affinity corev1.NodeAffinity
 		if numNodes > 1 {
-			nodeZone := zoneNodeSelectorExpression(z)
+			nodeZone := zoneNodeSelectorExpression(z, "server")
 			if s.AcrossAZ {
-				nodeZone = zoneNodeSelectorExpression(acrossZone)
+				nodeZone = zoneNodeSelectorExpression(acrossZone, "server")
 			}
 			affinity = corev1.NodeAffinity{
 				PreferredDuringSchedulingIgnoredDuringExecution: nodeZone,
@@ -449,7 +449,7 @@ func BuildSUT(client *kubernetes.Clientset, s *config.PerfScenarios) error {
 					Weight: 100,
 					Preference: corev1.NodeSelectorTerm{
 						MatchExpressions: []corev1.NodeSelectorRequirement{
-							{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"true"}},
+							{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{"server"}},
 						},
 					},
 				},
@@ -606,14 +606,14 @@ func launchClientVM(perf *config.PerfScenarios, name string, podAff *corev1.PodA
 	return nil
 }
 
-func zoneNodeSelectorExpression(zone string) []corev1.PreferredSchedulingTerm {
+func zoneNodeSelectorExpression(zone string, role string) []corev1.PreferredSchedulingTerm {
 	return []corev1.PreferredSchedulingTerm{
 		{
 			Weight: 100,
 			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"}},
+					{Key: "netperf", Operator: corev1.NodeSelectorOpIn, Values: []string{role}},
 				},
 			},
 		},