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 index ec33f2a1c..a7e871125 100644 --- a/cmd/kube-burner/ocp-config/node-density-cni/curl-deployment.yml +++ b/cmd/kube-burner/ocp-config/node-density-cni/curl-deployment.yml @@ -9,15 +9,16 @@ spec: name: curl-{{.Replica}}-{{.Iteration}} spec: 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 + nodeAffinity: + 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 index 21800f26b..34aa5c8d0 100644 --- a/cmd/kube-burner/ocp-config/node-density-cni/webserver-deployment.yml +++ b/cmd/kube-burner/ocp-config/node-density-cni/webserver-deployment.yml @@ -9,15 +9,16 @@ spec: name: webserver-{{.Replica}}-{{.Iteration}} spec: 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 + nodeAffinity: + 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 index bda1da9fd..c8f14e193 100644 --- a/cmd/kube-burner/ocp-config/node-density-heavy/app-deployment.yml +++ b/cmd/kube-burner/ocp-config/node-density-heavy/app-deployment.yml @@ -9,15 +9,16 @@ spec: name: perfapp-{{.Replica}}-{{.Iteration}} spec: 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 + nodeAffinity: + 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 index 8c1217554..3a169bc2a 100644 --- a/cmd/kube-burner/ocp-config/node-density-heavy/postgres-deployment.yml +++ b/cmd/kube-burner/ocp-config/node-density-heavy/postgres-deployment.yml @@ -9,15 +9,16 @@ spec: name: postgres-{{.Replica}}-{{.Iteration}} spec: 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 + nodeAffinity: + 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 index de1c1dc29..1232033f4 100644 --- a/cmd/kube-burner/ocp-config/node-density/pod.yml +++ b/cmd/kube-burner/ocp-config/node-density/pod.yml @@ -6,15 +6,16 @@ metadata: name: {{.JobName}}-{{.Iteration}} spec: 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 + nodeAffinity: + 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