Skip to content

Commit f800e5a

Browse files
authored
Merge pull request #20900 from caseydavenport/casey-update-calico
Update the vesion of Calico in kubeadm docs
2 parents 1a189d1 + c0f669a commit f800e5a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,10 @@ Below you can find installation instructions for some popular Pod network plugin
303303
{{% tab name="Calico" %}}
304304
[Calico](https://docs.projectcalico.org/latest/introduction/) is a networking and network policy provider. Calico supports a flexible set of networking options so you can choose the most efficient option for your situation, including non-overlay and overlay networks, with or without BGP. Calico uses the same engine to enforce network policy for hosts, pods, and (if using Istio & Envoy) applications at the service mesh layer. Calico works on several architectures, including `amd64`, `arm64`, and `ppc64le`.
305305

306-
By default, Calico uses `192.168.0.0/16` as the Pod network CIDR, though this can be configured in the calico.yaml file. For Calico to work correctly, you need to pass this same CIDR to the `kubeadm init` command using the `--pod-network-cidr=192.168.0.0/16` flag or via kubeadm's configuration.
306+
Calico will automatically detect which IP address range to use for pod IPs based on the value provided via the `--pod-network-cidr` flag or via kubeadm's configuration.
307307

308308
```shell
309-
kubectl apply -f https://docs.projectcalico.org/v3.11/manifests/calico.yaml
309+
kubectl apply -f https://docs.projectcalico.org/v3.14/manifests/calico.yaml
310310
```
311311

312312
{{% /tab %}}

content/en/docs/setup/production-environment/tools/kubeadm/high-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ option. Your cluster requirements may need a different configuration.
122122
{{< /note >}}
123123

124124
{{< note >}}
125-
Some CNI network plugins like Calico require a CIDR such as `192.168.0.0/16` and
126-
some like Weave do not. See the [CNI network documentation](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#pod-network).
125+
Some CNI network plugins require additional configuration, for example specifying the pod IP CIDR, while others do not.
126+
See the [CNI network documentation](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#pod-network).
127127
To add a pod CIDR pass the flag `--pod-network-cidr`, or if you are using a kubeadm configuration file
128128
set the `podSubnet` field under the `networking` object of `ClusterConfiguration`.
129129
{{< /note >}}

0 commit comments

Comments
 (0)