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

Prefer nodes with "master" role for Canal Typha pods #9663

Merged
merged 1 commit into from
Aug 1, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Aug 1, 2020

Adding the fix from #9609 to Canal also.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 1, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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

@k8s-ci-robot k8s-ci-robot added area/addons approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 1, 2020
@johngmyers
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 1, 2020
@hakman
Copy link
Member Author

hakman commented Aug 1, 2020

Thanks @johngmyers

@k8s-ci-robot k8s-ci-robot merged commit 197b6a6 into kubernetes:master Aug 1, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Aug 1, 2020
k8s-ci-robot added a commit that referenced this pull request Aug 1, 2020
…pstream-release-1.18

Automated cherry pick of #9663: Prefer nodes with "master" role for Canal Typha pods
@hakman hakman deleted the canal-typha-affinity branch August 15, 2020 06:25
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. area/addons 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

3 participants