From 8c7df9ffa6eba4cc0289b38069e08508130cce4e Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Wed, 23 Sep 2020 12:23:48 -0500 Subject: [PATCH 1/3] Enhance nfd-worker placement Enable NFD operator to deploy nfd-worker pods on nodes labeled other than "node-role.kubernetes.io/worker" Also: Fix clean-labels make target Signed-off-by: Carlos Eduardo Arango Gutierrez --- Makefile | 2 +- assets/worker/0700_worker_daemonset.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6cd34b4d..1fa95c73 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ clean: rm -f $(BIN) clean-labels: - @$(shell kubectl get no -o yaml | sed -e '/^\s*nfd.node.kubernetes.io/d' -e '/^\s*feature.node.kubernetes.io/d' | kubectl replace -f -) + kubectl get no -o yaml | sed -e '/^\s*nfd.node.kubernetes.io/d' -e '/^\s*feature.node.kubernetes.io/d' | kubectl replace -f - image: $(IMAGE_BUILD_CMD) -t $(IMAGE_TAG) \ diff --git a/assets/worker/0700_worker_daemonset.yaml b/assets/worker/0700_worker_daemonset.yaml index cf5b5bed..8d02a644 100644 --- a/assets/worker/0700_worker_daemonset.yaml +++ b/assets/worker/0700_worker_daemonset.yaml @@ -13,8 +13,13 @@ spec: labels: app: nfd-worker spec: - nodeSelector: - node-role.kubernetes.io/worker: "" + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node-role.kubernetes.io/master + operator: DoesNotExist hostNetwork: true serviceAccount: nfd-worker readOnlyRootFilesystem: true From 1fea5b7f7662afacb5ff36b078d038edb042f8ef Mon Sep 17 00:00:00 2001 From: Carlos Arango Gutierrez Date: Fri, 25 Sep 2020 08:52:46 -0500 Subject: [PATCH 2/3] Add tolerations Co-authored-by: Markus Lehtonen --- assets/worker/0700_worker_daemonset.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/worker/0700_worker_daemonset.yaml b/assets/worker/0700_worker_daemonset.yaml index 8d02a644..017d44dc 100644 --- a/assets/worker/0700_worker_daemonset.yaml +++ b/assets/worker/0700_worker_daemonset.yaml @@ -13,6 +13,10 @@ spec: labels: app: nfd-worker spec: + tolerations: + - operator: "Exists" + effect: "NoSchedule" + affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: From b9977bc1e90a61107b631909dceee3a89c2817de Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Fri, 25 Sep 2020 08:54:49 -0500 Subject: [PATCH 3/3] rm extra white line after tolerations Signed-off-by: Carlos Eduardo Arango Gutierrez --- assets/worker/0700_worker_daemonset.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/worker/0700_worker_daemonset.yaml b/assets/worker/0700_worker_daemonset.yaml index 017d44dc..710bfcfa 100644 --- a/assets/worker/0700_worker_daemonset.yaml +++ b/assets/worker/0700_worker_daemonset.yaml @@ -16,7 +16,6 @@ spec: tolerations: - operator: "Exists" effect: "NoSchedule" - affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: