whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Calico to v3.7 (#14501)

Browse Source
This commit is contained in:
Casey Davenport
2019-06-05 22:38:10 -07:00
committed by Kubernetes Prow Robot
parent 7fef09fee1
commit 6c85c9c478
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/zh/docs/setup/independent/create-cluster-kubeadm.md
+4 -8
View File
@@ -433,8 +433,7 @@ For more information about using Calico, see [Quickstart for Calico on Kubernete
For Calico to work correctly, you need to pass `--Pod-network-cidr=192.168.0.0/16` to `kubeadm init` or update the `calico.yml` file to match your Pod network. Note that Calico works on `amd64` only.
```shell
kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/calico.yaml
```
-->
@@ -445,8 +444,7 @@ kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/
或者根据您的网络方案更新 `calico.yml` 。注意 Calico 只适用于 `amd64` 架构。
```shell
kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/calico.yaml
```
{{% /tab %}}
@@ -457,8 +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.1/getting-started/kubernetes/installation/hosted/canal/rbac.yaml
kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/canal/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
```
-->
@@ -469,8 +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.1/getting-started/kubernetes/installation/hosted/canal/rbac.yaml
kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/canal/canal.yaml
kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml
```
{{% /tab %}}