From c8f34ff15b9366a51d01b5dd0e5a23841b7e38bc Mon Sep 17 00:00:00 2001 From: "Johannes M. Scheuermann" Date: Mon, 21 Sep 2020 14:17:40 +0200 Subject: [PATCH 1/2] Remove CNI alpha warning --- .../compute-storage-net/network-plugins.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md index b32bce83dd..59b9119f13 100644 --- a/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md +++ b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md @@ -11,16 +11,11 @@ weight: 10 -{{< feature-state state="alpha" >}} -{{< caution >}}Alpha features can change rapidly. {{< /caution >}} - Network plugins in Kubernetes come in a few flavors: * CNI plugins: adhere to the appc/CNI specification, designed for interoperability. * Kubenet plugin: implements basic `cbr0` using the `bridge` and `host-local` CNI plugins - - ## Installation @@ -166,9 +161,4 @@ This option is provided to the network-plugin; currently **only kubenet supports * `--network-plugin=kubenet` specifies that we use the `kubenet` network plugin with CNI `bridge` and `host-local` plugins placed in `/opt/cni/bin` or `cni-bin-dir`. * `--network-plugin-mtu=9001` specifies the MTU to use, currently only used by the `kubenet` network plugin. - - ## {{% heading "whatsnext" %}} - - - From c3a9924bbf2779b7f3e9ea43f03a70ac42d96ab1 Mon Sep 17 00:00:00 2001 From: "Johannes M. Scheuermann" Date: Tue, 13 Oct 2020 07:22:28 +0200 Subject: [PATCH 2/2] Make the CNI usage more accurate --- .../extend-kubernetes/compute-storage-net/network-plugins.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md index 59b9119f13..0384754e35 100644 --- a/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md +++ b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md @@ -13,14 +13,15 @@ weight: 10 Network plugins in Kubernetes come in a few flavors: -* CNI plugins: adhere to the appc/CNI specification, designed for interoperability. +* CNI plugins: adhere to the [Container Network Interface](https://github.com/containernetworking/cni) (CNI) specification, designed for interoperability. + * Kubernetes follows the [v0.4.0](https://github.com/containernetworking/cni/blob/spec-v0.4.0/SPEC.md) release of the CNI specification. * Kubenet plugin: implements basic `cbr0` using the `bridge` and `host-local` CNI plugins ## Installation -The kubelet has a single default network plugin, and a default network common to the entire cluster. It probes for plugins when it starts up, remembers what it finds, and executes the selected plugin at appropriate times in the pod lifecycle (this is only true for Docker, as rkt manages its own CNI plugins). There are two Kubelet command line parameters to keep in mind when using plugins: +The kubelet has a single default network plugin, and a default network common to the entire cluster. It probes for plugins when it starts up, remembers what it finds, and executes the selected plugin at appropriate times in the pod lifecycle (this is only true for Docker, as CRI manages its own CNI plugins). There are two Kubelet command line parameters to keep in mind when using plugins: * `cni-bin-dir`: Kubelet probes this directory for plugins on startup * `network-plugin`: The network plugin to use from `cni-bin-dir`. It must match the name reported by a plugin probed from the plugin directory. For CNI plugins, this is simply "cni".