From 6c85c9c478498544da36c945b0d62c4ca6fa81de Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 5 Jun 2019 22:38:10 -0700 Subject: [PATCH] Update Calico to v3.7 (#14501) --- .../docs/setup/independent/create-cluster-kubeadm.md | 6 ++---- .../docs/setup/independent/create-cluster-kubeadm.md | 8 ++++---- .../docs/setup/independent/create-cluster-kubeadm.md | 6 ++---- .../docs/setup/independent/create-cluster-kubeadm.md | 12 ++++-------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/content/en/docs/setup/independent/create-cluster-kubeadm.md b/content/en/docs/setup/independent/create-cluster-kubeadm.md index 67bd724c2b..49208d8c5b 100644 --- a/content/en/docs/setup/independent/create-cluster-kubeadm.md +++ b/content/en/docs/setup/independent/create-cluster-kubeadm.md @@ -288,8 +288,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`, `arm64`, and `ppc64le` only. ```shell -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml -kubectl apply -f https://docs.projectcalico.org/v3.3/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 %}} @@ -299,8 +298,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.3/getting-started/kubernetes/installation/hosted/canal/rbac.yaml -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/canal/canal.yaml +kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml ``` {{% /tab %}} diff --git a/content/fr/docs/setup/independent/create-cluster-kubeadm.md b/content/fr/docs/setup/independent/create-cluster-kubeadm.md index 49d159f2f4..12c5a5ba77 100644 --- a/content/fr/docs/setup/independent/create-cluster-kubeadm.md +++ b/content/fr/docs/setup/independent/create-cluster-kubeadm.md @@ -305,9 +305,9 @@ Pour plus d'informations sur l'utilisation de Calico, voir Pour que Calico fonctionne correctement, vous devez passer `--pod-network-cidr = 192.168.0.0 / 16` à` kubeadm init` ou mettre à jour le fichier `calico.yml` pour qu'il corresponde à votre réseau de Pod. Notez que Calico fonctionne uniquement sur `amd64`,` arm64`, `ppc64le` et` s390x`. + ```shell -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml -kubectl apply -f https://docs.projectcalico.org/v3.3/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 %}} @@ -317,9 +317,9 @@ documentation Calico pour obtenir le [guide de démarrage officiel](https://docs Pour que Canal fonctionne correctement, `--pod-network-cidr = 10.244.0.0 / 16` doit être passé à ` kubeadm init`. Notez que Canal ne fonctionne que sur `amd64`. + ```shell -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/canal/rbac.yaml -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/canal/canal.yaml +kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml ``` {{% /tab %}} diff --git a/content/ja/docs/setup/independent/create-cluster-kubeadm.md b/content/ja/docs/setup/independent/create-cluster-kubeadm.md index 8c519ae1c1..ff8e151442 100644 --- a/content/ja/docs/setup/independent/create-cluster-kubeadm.md +++ b/content/ja/docs/setup/independent/create-cluster-kubeadm.md @@ -282,8 +282,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`, `arm64`, and `ppc64le` only. ```shell -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml -kubectl apply -f https://docs.projectcalico.org/v3.3/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 %}} @@ -293,8 +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.3/getting-started/kubernetes/installation/hosted/canal/rbac.yaml -kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/canal/canal.yaml +kubectl apply -f https://docs.projectcalico.org/v3.7/manifests/canal.yaml ``` {{% /tab %}} diff --git a/content/zh/docs/setup/independent/create-cluster-kubeadm.md b/content/zh/docs/setup/independent/create-cluster-kubeadm.md index 5eaf10b551..9f3cbe89ef 100644 --- a/content/zh/docs/setup/independent/create-cluster-kubeadm.md +++ b/content/zh/docs/setup/independent/create-cluster-kubeadm.md @@ -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 %}}