Skip to content

Remove redundant information when deploy flannel on kubernetes include windows node#18274

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
wawa0210:remove-redundant-flannelpatch-en
Jan 17, 2020
Merged

Remove redundant information when deploy flannel on kubernetes include windows node#18274
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
wawa0210:remove-redundant-flannelpatch-en

Conversation

@wawa0210
Copy link
Copy Markdown
Contributor

Because the official flannel deployment yaml already contains the affinity options for deploying to linux nodes,there is no need to configure affinity in additional

The official documentation is as follows

https://github.com/coreos/flannel/blob/960b3243b9a7faccdfe7b3c09097105e68030ea7/Documentation/kube-flannel.yml#L152-L164

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 24, 2019
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Dec 24, 2019
@wawa0210
Copy link
Copy Markdown
Contributor Author

/assign @jaredbhatti

@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 16, 2020

/sig windows

@k8s-ci-robot k8s-ci-robot added the sig/windows Categorizes an issue or PR as relevant to SIG Windows. label Jan 16, 2020
@benmoss
Copy link
Copy Markdown
Member

benmoss commented Jan 17, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 17, 2020
Copy link
Copy Markdown
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

/approve

Thanks @wawa0210 & @benmoss

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sftim

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

The pull request process is described here

Details 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2020
@k8s-ci-robot k8s-ci-robot merged commit e3a7a56 into kubernetes:master Jan 17, 2020
@wawa0210 wawa0210 deleted the remove-redundant-flannelpatch-en branch January 17, 2020 15:55
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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants