Fix nodeSelector expression (kube-burner#234)

Signed-off-by: Raul Sevilla <[email protected]>
rsevilla87 · Jan 12, 2023 · 2c1954d · 2c1954d
1 parent 79c5d35
commit 2c1954d
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 17 deletions.
diff --git a/cmd/kube-burner/ocp-config/node-density-cni/curl-deployment.yml b/cmd/kube-burner/ocp-config/node-density-cni/curl-deployment.yml
@@ -8,8 +8,16 @@ spec:
       labels:
         name: curl-{{.Replica}}-{{.Iteration}}
     spec:
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
+      affinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: node-role.kubernetes.io/worker
+              operator: Exists
+            - key: node-role.kubernetes.io/infra
+              operator: DoesNotExist
+            - key: node-role.kubernetes.io/workload
+              operator: DoesNotExist
       containers:
       - name: curlapp
         image: quay.io/cloud-bulldozer/curl:latest

diff --git a/cmd/kube-burner/ocp-config/node-density-cni/webserver-deployment.yml b/cmd/kube-burner/ocp-config/node-density-cni/webserver-deployment.yml
@@ -8,8 +8,16 @@ spec:
       labels:
         name: webserver-{{.Replica}}-{{.Iteration}}
     spec:
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
+      affinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: node-role.kubernetes.io/worker
+              operator: Exists
+            - key: node-role.kubernetes.io/infra
+              operator: DoesNotExist
+            - key: node-role.kubernetes.io/workload
+              operator: DoesNotExist
       containers:
       - name: webserver
         image: quay.io/cloud-bulldozer/sampleapp:latest

diff --git a/cmd/kube-burner/ocp-config/node-density-heavy/app-deployment.yml b/cmd/kube-burner/ocp-config/node-density-heavy/app-deployment.yml
@@ -8,8 +8,16 @@ spec:
       labels:
         name: perfapp-{{.Replica}}-{{.Iteration}}
     spec:
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
+      affinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: node-role.kubernetes.io/worker
+              operator: Exists
+            - key: node-role.kubernetes.io/infra
+              operator: DoesNotExist
+            - key: node-role.kubernetes.io/workload
+              operator: DoesNotExist
       containers:
       - name: perfapp
         image: quay.io/cloud-bulldozer/perfapp:latest

diff --git a/cmd/kube-burner/ocp-config/node-density-heavy/postgres-deployment.yml b/cmd/kube-burner/ocp-config/node-density-heavy/postgres-deployment.yml
@@ -8,8 +8,16 @@ spec:
       labels:
         name: postgres-{{.Replica}}-{{.Iteration}}
     spec:
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
+      affinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: node-role.kubernetes.io/worker
+              operator: Exists
+            - key: node-role.kubernetes.io/infra
+              operator: DoesNotExist
+            - key: node-role.kubernetes.io/workload
+              operator: DoesNotExist
       containers:
       - name: postgresql
         image: registry.redhat.io/rhel8/postgresql-10@sha256:4b912c80085b88a03309aeb7907efcc29dd3342fa3952b6ea067afb1914bfe53

diff --git a/cmd/kube-burner/ocp-config/node-density/pod.yml b/cmd/kube-burner/ocp-config/node-density/pod.yml
@@ -5,8 +5,16 @@ metadata:
     app: node-density-{{.Iteration}}
   name: {{.JobName}}-{{.Iteration}}
 spec:
-  nodeSelector:
-    node-role.kubernetes.io/worker: ""
+  affinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/worker
+          operator: Exists
+        - key: node-role.kubernetes.io/infra
+          operator: DoesNotExist
+        - key: node-role.kubernetes.io/workload
+          operator: DoesNotExist
   tolerations:
   - key: os
     value: Windows

diff --git a/pkg/discovery/discovery.go b/pkg/discovery/discovery.go
@@ -113,15 +113,15 @@ func getBearerToken(clientset *kubernetes.Clientset) (string, error) {
 
 // GetWorkerNodeCount returns the number of worker nodes
 func (da *Agent) GetWorkerNodeCount() (int, error) {
-	nodeList, err := da.clientSet.CoreV1().Nodes().List(context.TODO(), v1.ListOptions{LabelSelector: "node-role.kubernetes.io/worker="})
-	log.Debug("Node count: ", len(nodeList.Items))
+	nodeList, err := da.clientSet.CoreV1().Nodes().List(context.TODO(), v1.ListOptions{LabelSelector: workerNodeSelector})
+	log.Infof("Listed nodes after using selector %s: %d", workerNodeSelector, len(nodeList.Items))
 	return len(nodeList.Items), err
 }
 
 // GetCurrentPodCount returns the number of current running pods across all worker nodes
 func (da *Agent) GetCurrentPodCount() (int, error) {
 	var podCount int
-	nodeList, err := da.clientSet.CoreV1().Nodes().List(context.TODO(), v1.ListOptions{LabelSelector: "node-role.kubernetes.io/worker="})
+	nodeList, err := da.clientSet.CoreV1().Nodes().List(context.TODO(), v1.ListOptions{LabelSelector: workerNodeSelector})
 	if err != nil {
 		return podCount, err
 	}

diff --git a/pkg/discovery/types.go b/pkg/discovery/types.go
@@ -45,8 +45,9 @@ type NodeInfo struct {
 }
 
 const (
-	routeGroup      = "route.openshift.io"
-	routeVersion    = "v1"
-	routeResource   = "routes"
-	completedUpdate = "Completed"
+	routeGroup         = "route.openshift.io"
+	routeVersion       = "v1"
+	routeResource      = "routes"
+	completedUpdate    = "Completed"
+	workerNodeSelector = "node-role.kubernetes.io/worker=,node-role.kubernetes.io/infra!=,node-role.kubernetes.io/workload!="
 )