Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions templates/addons/calico-dual-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,15 @@ installation:
encapsulation: None
natOutgoing: Enabled
nodeSelector: all()
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
# when it continuously gets scheduled onto an out-of-date Node that is being
# deleted. Tolerate only the NoSchedule taints that are expected.
tolerations:
- effect: NoExecute
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this would have been better asked in the original PR, but should we add a comment describing why we want to tolerate all NoExecute taints?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That toleration was already set by default, so I was only trying to change as few things as possible to get around the flake.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a bug in the comment

By default, tigera tolerates all NoSchedule taints

should it be

By default, tigera tolerates all NoExecute taints

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both are true. I was trying to call out the delta between what tigera sets by default and what we need to change it to.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good talk

operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
12 changes: 12 additions & 0 deletions templates/addons/calico-ipv6/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,15 @@ installation:
encapsulation: None
natOutgoing: Enabled
nodeSelector: all()
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
# when it continuously gets scheduled onto an out-of-date Node that is being
# deleted. Tolerate only the NoSchedule taints that are expected.
tolerations:
- effect: NoExecute
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
12 changes: 12 additions & 0 deletions templates/addons/calico/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,15 @@ tigeraOperator:
registry: mcr.microsoft.com/oss
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
# when it continuously gets scheduled onto an out-of-date Node that is being
# deleted. Tolerate only the NoSchedule taints that are expected.
tolerations:
- effect: NoExecute
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
12 changes: 12 additions & 0 deletions templates/addons/cluster-api-helm/calico-dual-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,15 @@ spec:
registry: mcr.microsoft.com/oss
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
# when it continuously gets scheduled onto an out-of-date Node that is being
# deleted. Tolerate only the NoSchedule taints that are expected.
tolerations:
- effect: NoExecute
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
14 changes: 13 additions & 1 deletion templates/addons/cluster-api-helm/calico-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,16 @@ spec:
image: tigera/operator
registry: mcr.microsoft.com/oss
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: mcr.microsoft.com/oss/calico/ctl
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
# when it continuously gets scheduled onto an out-of-date Node that is being
# deleted. Tolerate only the NoSchedule taints that are expected.
tolerations:
- effect: NoExecute
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
14 changes: 13 additions & 1 deletion templates/addons/cluster-api-helm/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,16 @@ spec:
image: tigera/operator
registry: mcr.microsoft.com/oss
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: mcr.microsoft.com/oss/calico/ctl
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
# when it continuously gets scheduled onto an out-of-date Node that is being
# deleted. Tolerate only the NoSchedule taints that are expected.
tolerations:
- effect: NoExecute
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-apiserver-ilb.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-ci-version-dra.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-ci-version.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-custom-vnet.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions templates/test/ci/cluster-template-prow-dual-stack.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-edgezone.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion templates/test/ci/cluster-template-prow-flatcar-sysext.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading