Upgrade calico canal to 3.8 (#15420)

Signed-off-by: ialidzhikov <i.alidjikov@gmail.com>
This commit is contained in:
Ismail Alidzhikov 2019-07-15 03:39:03 +03:00 committed by Kubernetes Prow Robot
parent ce1753952e
commit cb034f9138
4 changed files with 5 additions and 5 deletions

View File

@ -305,7 +305,7 @@ Canal uses Calico for policy and Flannel for networking. Refer to the Calico doc
For Canal to work correctly, `--pod-network-cidr=10.244.0.0/16` has to be passed to `kubeadm init`. Note that Canal works on `amd64` only.
```shell
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/canal.yaml
```
{{% /tab %}}

View File

@ -319,7 +319,7 @@ Pour que Canal fonctionne correctement, `--pod-network-cidr = 10.244.0.0 / 16` d
` kubeadm init`. Notez que Canal ne fonctionne que sur `amd64`.
```shell
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/canal.yaml
```
{{% /tab %}}

View File

@ -292,7 +292,7 @@ Canal uses Calico for policy and Flannel for networking. Refer to the Calico doc
For Canal to work correctly, `--pod-network-cidr=10.244.0.0/16` has to be passed to `kubeadm init`. Note that Canal works on `amd64` only.
```shell
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/canal.yaml
```
{{% /tab %}}

View File

@ -455,7 +455,7 @@ Canal uses Calico for policy and Flannel for networking. Refer to the Calico doc
For Canal to work correctly, `--Pod-network-cidr=10.244.0.0/16` has to be passed to `kubeadm init`. Note that Canal works on `amd64` only.
```shell
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/canal.yaml
```
-->
@ -466,7 +466,7 @@ Canal 使用 Calico 提供的网络策略和 Flannel 提供的网络功能。请
为了 Canal 可以正确运行,`kubeadm init` 运行时需要设置`--Pod-network-cidr=10.244.0.0/16`,同时注意它只适用于 `amd64` 架构。
```shell
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/canal.yaml
```
{{% /tab %}}