Skip to content

Commit 2c0cd92

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5890 from nojnhuh/tigera-tolerations
[release-1.20] Define NoSchedule tolerations for tigera-operator
2 parents 46400ac + f96822a commit 2c0cd92

File tree

39 files changed

+501
-33
lines changed

39 files changed

+501
-33
lines changed

‎templates/addons/calico-dual-stack/values.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,15 @@ installation:
1717
encapsulation: None
1818
natOutgoing: Enabled
1919
nodeSelector: all()
20+
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
21+
# when it continuously gets scheduled onto an out-of-date Node that is being
22+
# deleted. Tolerate only the NoSchedule taints that are expected.
23+
tolerations:
24+
- effect: NoExecute
25+
operator: Exists
26+
- effect: NoSchedule
27+
key: node-role.kubernetes.io/control-plane
28+
operator: Exists
29+
- effect: NoSchedule
30+
key: node.kubernetes.io/not-ready
31+
operator: Exists

‎templates/addons/calico-ipv6/values.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,15 @@ installation:
1212
encapsulation: None
1313
natOutgoing: Enabled
1414
nodeSelector: all()
15+
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
16+
# when it continuously gets scheduled onto an out-of-date Node that is being
17+
# deleted. Tolerate only the NoSchedule taints that are expected.
18+
tolerations:
19+
- effect: NoExecute
20+
operator: Exists
21+
- effect: NoSchedule
22+
key: node-role.kubernetes.io/control-plane
23+
operator: Exists
24+
- effect: NoSchedule
25+
key: node.kubernetes.io/not-ready
26+
operator: Exists

‎templates/addons/calico/values.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,15 @@ tigeraOperator:
1414
registry: mcr.microsoft.com/oss
1515
calicoctl:
1616
image: mcr.microsoft.com/oss/calico/ctl
17+
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
18+
# when it continuously gets scheduled onto an out-of-date Node that is being
19+
# deleted. Tolerate only the NoSchedule taints that are expected.
20+
tolerations:
21+
- effect: NoExecute
22+
operator: Exists
23+
- effect: NoSchedule
24+
key: node-role.kubernetes.io/control-plane
25+
operator: Exists
26+
- effect: NoSchedule
27+
key: node.kubernetes.io/not-ready
28+
operator: Exists

‎templates/addons/cluster-api-helm/calico-dual-stack.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,15 @@ spec:
3838
registry: mcr.microsoft.com/oss
3939
calicoctl:
4040
image: mcr.microsoft.com/oss/calico/ctl
41+
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
42+
# when it continuously gets scheduled onto an out-of-date Node that is being
43+
# deleted. Tolerate only the NoSchedule taints that are expected.
44+
tolerations:
45+
- effect: NoExecute
46+
operator: Exists
47+
- effect: NoSchedule
48+
key: node-role.kubernetes.io/control-plane
49+
operator: Exists
50+
- effect: NoSchedule
51+
key: node.kubernetes.io/not-ready
52+
operator: Exists

‎templates/addons/cluster-api-helm/calico-ipv6.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,16 @@ spec:
3232
image: tigera/operator
3333
registry: mcr.microsoft.com/oss
3434
calicoctl:
35-
image: mcr.microsoft.com/oss/calico/ctl
35+
image: mcr.microsoft.com/oss/calico/ctl
36+
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
37+
# when it continuously gets scheduled onto an out-of-date Node that is being
38+
# deleted. Tolerate only the NoSchedule taints that are expected.
39+
tolerations:
40+
- effect: NoExecute
41+
operator: Exists
42+
- effect: NoSchedule
43+
key: node-role.kubernetes.io/control-plane
44+
operator: Exists
45+
- effect: NoSchedule
46+
key: node.kubernetes.io/not-ready
47+
operator: Exists

‎templates/addons/cluster-api-helm/calico.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,16 @@ spec:
3030
image: tigera/operator
3131
registry: mcr.microsoft.com/oss
3232
calicoctl:
33-
image: mcr.microsoft.com/oss/calico/ctl
33+
image: mcr.microsoft.com/oss/calico/ctl
34+
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
35+
# when it continuously gets scheduled onto an out-of-date Node that is being
36+
# deleted. Tolerate only the NoSchedule taints that are expected.
37+
tolerations:
38+
- effect: NoExecute
39+
operator: Exists
40+
- effect: NoSchedule
41+
key: node-role.kubernetes.io/control-plane
42+
operator: Exists
43+
- effect: NoSchedule
44+
key: node.kubernetes.io/not-ready
45+
operator: Exists

‎templates/test/ci/cluster-template-prow-apiserver-ilb.yaml‎

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version-dra.yaml‎

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml‎

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)