Merge pull request #31849 from mk46/fp_31667

Remove --pod-cidr from docs
pull/33410/head
Kubernetes Prow Robot 2022-04-29 16:21:12 -07:00 committed by GitHub
commit 8170154a6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View File

@ -24,7 +24,7 @@ CNI specification (plugins can be compatible with multiple spec versions).
## Installation
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:
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:
* `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 `cni`.

View File

@ -30,8 +30,6 @@ To run the node conformance test, perform the following steps:
Because the test framework starts a local control plane to test the kubelet,
use `http://localhost:8080` as the URL of the API server.
There are some other kubelet command line parameters you may want to use:
* `--pod-cidr`: The CIDR to use for pod IP addresses, only used in standalone mode.
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`.
* `--cloud-provider`: If you are using `--cloud-provider=gce`, you should
remove the flag to run the test.