Update networking.md #3950
Merged
Update networking.md #3950
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added CNI-Genie as one of the many options
k8s-ci-robot
added
the
cncf-cla: yes
|
@chenopis any ideas who would be the best person to review this PR? Thx! |
chenopis
suggested changes
May 31, 2017
| @@ -223,6 +223,12 @@ Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-pl | |||
| or stand-alone. In either version, it doesn't require any configuration or extra code | |||
| to run, and in both cases, the network provides one IP address per pod - as is standard for Kubernetes. | |||
|
|
|||
| ### CNI-Genie from Huawei | |||
|
|
|||
| [CNI-Genie](https://github.com/Huawei-PaaS/CNI-Genie) is an open source software that enables Kubernetes to [simultanously have access to different implementations](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-cni-plugins/README.md#what-cni-genie-feature-1-multiple-cni-plugins-enables) of [Kubernetes network model](https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/concepts/cluster-administration/networking.md#kubernetes-model) in runtime. This includes any implementation that runs as a [CNI plugin](https://github.com/containernetworking/cni#3rd-party-plugins), such as [Flannel](https://github.com/coreos/flannel#flannel), [Calico](http://docs.projectcalico.org/), [Romana](http://romana.io), [Weave-net](https://www.weave.works/products/weave-net/). | |||
There was a problem hiding this comment.
Add "the": "...to simultanously have access to different implementations of the Kubernetes network model in runtime."
|
@thockin You have a moment to take a quick look at this? |
chenopis
approved these changes
May 31, 2017
|
@thockin since it was just mentioned in the SIG meeting that today is the code freeze, do you think this PR could possibly be considered for 1.7 release? |
|
Docs changes are governed differently from code changes, and this is not release specific. |
thockin
reviewed
Jun 4, 2017
| @@ -223,6 +223,12 @@ Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-pl | |||
| or stand-alone. In either version, it doesn't require any configuration or extra code | |||
| to run, and in both cases, the network provides one IP address per pod - as is standard for Kubernetes. | |||
|
|
|||
| ### CNI-Genie from Huawei | |||
|
|
|||
| [CNI-Genie](https://github.com/Huawei-PaaS/CNI-Genie) is an open source software that enables Kubernetes to [simultanously have access to different implementations](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-cni-plugins/README.md#what-cni-genie-feature-1-multiple-cni-plugins-enables) of the [Kubernetes network model](https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/concepts/cluster-administration/networking.md#kubernetes-model) in runtime. This includes any implementation that runs as a [CNI plugin](https://github.com/containernetworking/cni#3rd-party-plugins), such as [Flannel](https://github.com/coreos/flannel#flannel), [Calico](http://docs.projectcalico.org/), [Romana](http://romana.io), [Weave-net](https://www.weave.works/products/weave-net/). | |||
There was a problem hiding this comment.
s/an open source software/a CNI plugin/
There was a problem hiding this comment.
@thockin comment addressed!
|
Back to you @chenopis |
chenopis
added a commit
that referenced
this pull request
Jun 5, 2017
…hub.io into release-1.7 * 'master' of https://github.com/kubernetes/kubernetes.github.io: Add TCP socket health check example (#3977) Update networking.md (#3950) [authorization] fix invalid href for webhook
chenopis
added a commit
that referenced
this pull request
Jun 5, 2017
…hub.io into release-1.6 * 'master' of https://github.com/kubernetes/kubernetes.github.io: Add TCP socket health check example (#3977) Update networking.md (#3950) [authorization] fix invalid href for webhook
chenopis
added a commit
to iphutch/kubernetes.github.io
that referenced
this pull request
Jun 26, 2017
…hub.io * 'master' of https://github.com/kubernetes/kubernetes.github.io: (859 commits) fixed the line giving the template for creating configmap, should include the word configmap as part of the creation process. Fixes issue kubernetes#3939 Add CRI runtime support Updaated install-kubeadm.md, removed redundant kubectl installation (kubernetes#4006) Add Chocolatey Package Manager for Windows (kubernetes#4000) Make issue title automatically a link Update directions for macOS bash completion Add TCP socket health check example (kubernetes#3977) Update networking.md (kubernetes#3950) [authorization] fix invalid href for webhook Remove self-referential link Add fibre channel volume explanation (kubernetes#3967) Improve RBAC doc (kubernetes#3951) Clarify CNI acronym Fix 404 to kubectl install link install-kubectl.md: Fix Windows texts, link to latest macOS binaries Create Installing kubeadm topic. (kubernetes#3709) Fix example in the "Adding ConfigMap data to a Volume" section Update ExternalName example Completes PR kubernetes#3325 ... # Conflicts: # _data/tasks.yml # docs/tasks/administer-cluster/namespaces-walkthrough.md # docs/tasks/administer-cluster/namespaces.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added CNI-Genie as one of the many options
This change is