Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cni toleration for tainted nodes #5804

Merged

Conversation

jhohertz
Copy link
Contributor

Related to #5730, replaces #5802 (mistakenly issued against release-1.10 branch)

This increases the tolerations for the two CNIs in the subject to allow them to deploy/work on clusters with instance groups that have a taint to them.

Note: I've not been able to test this in a build due to other apparent issues in the build (I am new to this codebase), but have verified that patching these manifests after the fact addresses the stated issue.

As mentioned in the other ticket, this is very similar changes made for other CNI providers as follows:

Canal: #3802, #3142
Calico: #3097

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 19, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 19, 2018
@chrisz100
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 19, 2018
@chrisz100
Copy link
Contributor

/lgtm
/assign @mikesplain
/assign @justinsb

Thank you for fixing this!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2018
Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

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

Thanks so much for this @jhohertz! For these changes to get picked up, you'll have to bump the version here as well:

version := "1.0.0-kops.1"

(bump the .1 to .2) and also bump for cilium as well in the same manor. Thanks!

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2018
Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

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

Perfect, thanks @jhohertz!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 19, 2018
@mikesplain
Copy link
Contributor

Oops, looks like you'll have to update the test as well:

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2018
@jhohertz
Copy link
Contributor Author

Thanks for helping me through this first PR. :)

@chrisz100
Copy link
Contributor

No worries! A pleasure :-)
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrisz100, jhohertz, mikesplain

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mikesplain
Copy link
Contributor

/retest

@k8s-ci-robot k8s-ci-robot merged commit f0762c3 into kubernetes:master Sep 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants