Skip to content

Commit 0e79de7

Browse files
committed
update azure and ash tolerations on node manager
In our documentation, we instruct users to add a NoExecute taint for the node-role.kubernetes.io/infra key. This is not tolerated by the azure node managers and can cause a race condition when new nodes are added that can prevent the node manager from running on a new node. This change updates the tolerations for azure and ash to allow the infra taint, and it also makes the ash permissions more tolerant (same as azure) to prevent future failures.
1 parent 70aa31a commit 0e79de7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

pkg/cloud/azure/assets/cloud-node-manager-daemonset.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ spec:
3434
tolerations:
3535
- effect: NoSchedule
3636
operator: Exists
37+
- effect: NoExecute
38+
key: node-role.kubernetes.io/infra
39+
operator: Exists
3740
- effect: NoExecute
3841
key: node.kubernetes.io/unreachable
3942
operator: Exists

pkg/cloud/azurestack/assets/cloud-node-manager-daemonset.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ spec:
3333
kubernetes.io/os: linux
3434
tolerations:
3535
- effect: NoSchedule
36-
key: node-role.kubernetes.io/master
36+
operator: Exists
37+
- effect: NoExecute
38+
key: node-role.kubernetes.io/infra
3739
operator: Exists
3840
- effect: NoExecute
3941
key: node.kubernetes.io/unreachable
@@ -43,12 +45,6 @@ spec:
4345
key: node.kubernetes.io/not-ready
4446
operator: Exists
4547
tolerationSeconds: 120
46-
- effect: NoSchedule
47-
key: node.cloudprovider.kubernetes.io/uninitialized
48-
operator: Exists
49-
- effect: NoSchedule
50-
key: node.kubernetes.io/not-ready
51-
operator: Exists
5248
initContainers:
5349
- name: azure-inject-credentials
5450
image: {{ .images.Operator }}

0 commit comments

Comments
 (0)