From e75697ce35d7773705f0b9b28ce1ffbe99f9493c Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Wed, 17 Jun 2020 22:46:35 -0700
Subject: [PATCH] Rename controller node label and NoSchedule taint

* Use node label `node.kubernetes.io/controller` to select
controller nodes (action required)
* Tolerate node taint `node-role.kubernetes.io/controller`
for workloads that should run on controller nodes. Don't
tolerate `node-role.kubernetes.io/master` (action required)
---
 resources/calico/daemonset.yaml             | 2 +-
 resources/flannel/daemonset.yaml            | 2 +-
 resources/kube-router/daemonset.yaml        | 2 +-
 resources/manifests/coredns/deployment.yaml | 4 ++--
 resources/manifests/kube-proxy.yaml         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/calico/daemonset.yaml b/resources/calico/daemonset.yaml
index 7e1f104..be222df 100644
--- a/resources/calico/daemonset.yaml
+++ b/resources/calico/daemonset.yaml
@@ -24,7 +24,7 @@ spec:
       priorityClassName: system-node-critical
       serviceAccountName: calico-node
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/controller
         operator: Exists
       - key: node.kubernetes.io/not-ready
         operator: Exists
diff --git a/resources/flannel/daemonset.yaml b/resources/flannel/daemonset.yaml
index 04a37bd..731891e 100644
--- a/resources/flannel/daemonset.yaml
+++ b/resources/flannel/daemonset.yaml
@@ -24,7 +24,7 @@ spec:
       priorityClassName: system-node-critical
       serviceAccountName: flannel
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/controller
         operator: Exists
       - key: node.kubernetes.io/not-ready
         operator: Exists
diff --git a/resources/kube-router/daemonset.yaml b/resources/kube-router/daemonset.yaml
index 4257391..492663a 100644
--- a/resources/kube-router/daemonset.yaml
+++ b/resources/kube-router/daemonset.yaml
@@ -24,7 +24,7 @@ spec:
       priorityClassName: system-node-critical
       serviceAccountName: kube-router
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/controller
         operator: Exists
       - key: node.kubernetes.io/not-ready
         operator: Exists
diff --git a/resources/manifests/coredns/deployment.yaml b/resources/manifests/coredns/deployment.yaml
index 8f55315..e558440 100644
--- a/resources/manifests/coredns/deployment.yaml
+++ b/resources/manifests/coredns/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           - weight: 100
             preference:
               matchExpressions:
-              - key: node.kubernetes.io/master
+              - key: node.kubernetes.io/controller
                 operator: Exists
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -50,7 +50,7 @@ spec:
       priorityClassName: system-cluster-critical
       serviceAccountName: coredns
       tolerations:
-        - key: node-role.kubernetes.io/master
+        - key: node-role.kubernetes.io/controller
           effect: NoSchedule
       containers:
         - name: coredns
diff --git a/resources/manifests/kube-proxy.yaml b/resources/manifests/kube-proxy.yaml
index cc014d8..b06c01b 100644
--- a/resources/manifests/kube-proxy.yaml
+++ b/resources/manifests/kube-proxy.yaml
@@ -27,7 +27,7 @@ spec:
       priorityClassName: system-node-critical
       serviceAccountName: kube-proxy
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/controller
         operator: Exists
       - key: node.kubernetes.io/not-ready
         operator: Exists