Skip to content

Update network-plugins.md#17109

Merged
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
jakowicz:patch-1
Oct 28, 2019
Merged

Update network-plugins.md#17109
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
jakowicz:patch-1

Conversation

@jakowicz
Copy link
Copy Markdown
Contributor

@jakowicz jakowicz commented Oct 22, 2019

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Remember to delete this note before submitting your pull request.

For pull requests on 1.17 Features: set Milestone to 1.17 and Base Branch to dev-1.17

For pull requests on Chinese localization, set Base Branch to release-1.16
Feel free to ask questions in #kubernetes-docs-zh

For pull requests on Korean Localization: set Base Branch to dev-1.16-ko.<latest team milestone>

If you need Help on editing and submitting pull requests, visit:
https://kubernetes.io/docs/contribute/start/#improve-existing-content.

If you need Help on choosing which branch to use, visit:
https://kubernetes.io/docs/contribute/start#choose-which-git-branch-to-use.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Oct 22, 2019

Welcome @jakowicz!

It looks like this is your first PR to kubernetes/website 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/website has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Oct 22, 2019

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 22, 2019
@k8s-ci-robot k8s-ci-robot requested review from dcbw and thockin October 22, 2019 10:09
@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 Oct 22, 2019
@netlify
Copy link
Copy Markdown

netlify bot commented Oct 22, 2019 •
edited
Loading

Deploy preview for kubernetes-io-master-staging ready!

Built with commit bf85dae

https://deploy-preview-17109--kubernetes-io-master-staging.netlify.com

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 22, 2019
miteshskj
miteshskj reviewed Oct 22, 2019
View reviewed changes
content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md Outdated
The CNI plugin is selected by passing Kubelet the `--network-plugin=cni` command-line option. Kubelet reads a file from `--cni-conf-dir` (default `/etc/cni/net.d`) and uses the CNI configuration from that file to set up each pod's network. The CNI configuration file must match the [CNI specification](https://github.com/containernetworking/cni/blob/master/SPEC.md#network-configuration), and any required CNI plugins referenced by the configuration must be present in `--cni-bin-dir` (default `/opt/cni/bin`).

If there are multiple CNI configuration files in the directory, the first one in lexicographic order of file name is used.
If there are multiple CNI configuration files in the directory, the first by name in lexicographicorder is used.
Copy link
Copy Markdown
Contributor

@miteshskj miteshskj Oct 22, 2019

Choose a reason for hiding this comment

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

missing space in "lexicographic order"

Copy link
Copy Markdown
Contributor

@sftim sftim Oct 22, 2019

Choose a reason for hiding this comment

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

Here's a suggested reword

Suggested change
If there are multiple CNI configuration files in the directory, the first by name in lexicographicorder is used.
If there are multiple CNI configuration files in the directory, the kubelet uses the configuration file that comes first by name in lexicographic order.

Copy link
Copy Markdown
Contributor Author

@jakowicz jakowicz Oct 25, 2019

Choose a reason for hiding this comment

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

@miteshskj Thanks that was hopeless of me
@sftim That's actually much better

@miteshskj miteshskj mentioned this pull request Oct 23, 2019
Closed
6 tasks
@bradtopol
Copy link
Copy Markdown
Contributor

bradtopol commented Oct 24, 2019

Assigning @sftim since he is already engaged on this. Tim, do you feel you need a technical reviewer as well? I can find one if need be.
/assign @sftim

sftim
sftim approved these changes Oct 27, 2019
View reviewed changes
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.

/lgtm

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

tengqm commented Oct 28, 2019

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Oct 28, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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 Oct 28, 2019
@k8s-ci-robot k8s-ci-robot merged commit b2f7b2f into kubernetes:master Oct 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dcbw dcbw Awaiting requested review from dcbw

@thockin thockin Awaiting requested review from thockin

2 more reviewers

@miteshskj miteshskj miteshskj left review comments

@sftim sftim sftim approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@sftim sftim

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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jakowicz @k8s-ci-robot @bradtopol @tengqm @sftim @miteshskj