Skip to content

Commit 8170154

Browse files
authored
Merge pull request #31849 from mk46/fp_31667
Remove --pod-cidr from docs
2 parents 07ae034 + c86ad85 commit 8170154

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CNI specification (plugins can be compatible with multiple spec versions).
2424

2525
## Installation
2626

27-
The kubelet has a single default network plugin, and a default network common to the entire cluster.The CRI manages its own CNI plugins. There are two Kubelet command line parameters to keep in mind when using plugins:
27+
A CNI plugin is required to implement the [Kubernetes network model](/docs/concepts/services-networking/#the-kubernetes-network-model). The CRI manages its own CNI plugins. There are two Kubelet command line parameters to keep in mind when using plugins:
2828

2929
* `cni-bin-dir`: Kubelet probes this directory for plugins on startup
3030
* `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 `cni`.

content/en/docs/setup/best-practices/node-conformance.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ To run the node conformance test, perform the following steps:
3030
Because the test framework starts a local control plane to test the kubelet,
3131
use `http://localhost:8080` as the URL of the API server.
3232
There are some other kubelet command line parameters you may want to use:
33-
* `--pod-cidr`: The CIDR to use for pod IP addresses, only used in standalone mode.
34-
In cluster mode, this is obtained from the master. For IPv6, the maximum number of IP's allocated is 65536. For example `--pod-cidr=10.180.0.0/24`.
3533
* `--cloud-provider`: If you are using `--cloud-provider=gce`, you should
3634
remove the flag to run the test.
3735

0 commit comments

Comments
 (0)