Skip to content

Commit 3ca8374

Browse files
authored
Merge pull request #24026 from johscheuer/remove-cni-alpha-warning
Remove CNI alpha warning
2 parents 720812a + c3a9924 commit 3ca8374

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,17 @@ weight: 10
1111

1212
<!-- overview -->
1313

14-
{{< feature-state state="alpha" >}}
15-
{{< caution >}}Alpha features can change rapidly. {{< /caution >}}
16-
1714
Network plugins in Kubernetes come in a few flavors:
1815

19-
* CNI plugins: adhere to the appc/CNI specification, designed for interoperability.
16+
* CNI plugins: adhere to the [Container Network Interface](https://github.com/containernetworking/cni) (CNI) specification, designed for interoperability.
17+
* Kubernetes follows the [v0.4.0](https://github.com/containernetworking/cni/blob/spec-v0.4.0/SPEC.md) release of the CNI specification.
2018
* Kubenet plugin: implements basic `cbr0` using the `bridge` and `host-local` CNI plugins
2119

22-
23-
2420
<!-- body -->
2521

2622
## Installation
2723

28-
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:
24+
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:
2925

3026
* `cni-bin-dir`: Kubelet probes this directory for plugins on startup
3127
* `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".
@@ -166,9 +162,4 @@ This option is provided to the network-plugin; currently **only kubenet supports
166162
* `--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`.
167163
* `--network-plugin-mtu=9001` specifies the MTU to use, currently only used by the `kubenet` network plugin.
168164

169-
170-
171165
## {{% heading "whatsnext" %}}
172-
173-
174-

0 commit comments

Comments
 (0)