From 80056a8c7313a4c943d2a047846fafb0f42e73f5 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
Date: Mon, 3 Mar 2025 17:34:40 +0100
Subject: [PATCH] Remove deprecated toleration/affinity value

Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
---
 deployment/components/common/master-affinity.yaml  | 14 --------------
 deployment/helm/node-feature-discovery/values.yaml | 10 ----------
 2 files changed, 24 deletions(-)

diff --git a/deployment/components/common/master-affinity.yaml b/deployment/components/common/master-affinity.yaml
index 3b5bdd88d..009baa4f4 100644
--- a/deployment/components/common/master-affinity.yaml
+++ b/deployment/components/common/master-affinity.yaml
@@ -3,12 +3,6 @@
   value:
     nodeAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 1
-        preference:
-          matchExpressions:
-          - key: "node-role.kubernetes.io/master"
-            operator: In
-            values: [""]
       - weight: 1
         preference:
           matchExpressions:
@@ -16,14 +10,6 @@
             operator: In
             values: [""]
 
-- op: add
-  path: /spec/template/spec/tolerations/-
-  value:
-    key: "node-role.kubernetes.io/master"
-    operator: "Equal"
-    value: ""
-    effect: "NoSchedule"
-
 - op: add
   path: /spec/template/spec/tolerations/-
   value:
diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
index 1b3225d62..d71b7bb5b 100644
--- a/deployment/helm/node-feature-discovery/values.yaml
+++ b/deployment/helm/node-feature-discovery/values.yaml
@@ -120,10 +120,6 @@ master:
   nodeSelector: {}
 
   tolerations:
-  - key: "node-role.kubernetes.io/master"
-    operator: "Equal"
-    value: ""
-    effect: "NoSchedule"
   - key: "node-role.kubernetes.io/control-plane"
     operator: "Equal"
     value: ""
@@ -134,12 +130,6 @@ master:
   affinity:
     nodeAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
-        - weight: 1
-          preference:
-            matchExpressions:
-              - key: "node-role.kubernetes.io/master"
-                operator: In
-                values: [""]
         - weight: 1
           preference:
             matchExpressions: