Skip to content

Commit 7b2418f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5819 from nojnhuh/typha-tolerations
Add specific tolerations to calico-typha pods
2 parents ecd4c98 + c22e904 commit 7b2418f

File tree

40 files changed

+520
-0
lines changed

40 files changed

+520
-0
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,19 @@ spec:
3535
spec:
3636
template:
3737
spec:
38+
# By default, typha tolerates all NoSchedule taints. This breaks
39+
# scale-ins when it continuously gets scheduled onto an
40+
# out-of-date Node that is being deleted. Tolerate only the
41+
# NoSchedule taints that are expected.
42+
tolerations:
43+
- effect: NoExecute
44+
operator: Exists
45+
- effect: NoSchedule
46+
key: node-role.kubernetes.io/control-plane
47+
operator: Exists
48+
- effect: NoSchedule
49+
key: node.kubernetes.io/not-ready
50+
operator: Exists
3851
affinity:
3952
nodeAffinity:
4053
preferredDuringSchedulingIgnoredDuringExecution:

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,19 @@ spec:
3030
spec:
3131
template:
3232
spec:
33+
# By default, typha tolerates all NoSchedule taints. This breaks
34+
# scale-ins when it continuously gets scheduled onto an
35+
# out-of-date Node that is being deleted. Tolerate only the
36+
# 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
3346
affinity:
3447
nodeAffinity:
3548
preferredDuringSchedulingIgnoredDuringExecution:

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,19 @@ spec:
2828
spec:
2929
template:
3030
spec:
31+
# By default, typha tolerates all NoSchedule taints. This breaks
32+
# scale-ins when it continuously gets scheduled onto an
33+
# out-of-date Node that is being deleted. Tolerate only the
34+
# NoSchedule taints that are expected.
35+
tolerations:
36+
- effect: NoExecute
37+
operator: Exists
38+
- effect: NoSchedule
39+
key: node-role.kubernetes.io/control-plane
40+
operator: Exists
41+
- effect: NoSchedule
42+
key: node.kubernetes.io/not-ready
43+
operator: Exists
3144
affinity:
3245
nodeAffinity:
3346
preferredDuringSchedulingIgnoredDuringExecution:

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

Lines changed: 13 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-apiserver-ilb.yaml

Lines changed: 13 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-dra.yaml

Lines changed: 13 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-dual-stack.yaml

Lines changed: 13 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 & 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-md-and-mp.yaml

Lines changed: 13 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.yaml

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

0 commit comments

Comments
 (0)