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)
This commit is contained in:
Dalton Hubble
2020-06-17 22:46:35 -07:00
parent 3fe903d0ac
commit e75697ce35
5 changed files with 6 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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