kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4724 from tmjd/update-calico-2-4-1 

Update Calico to latest
reviewable/pr4712/r1^2
Andrew Chen 2017-08-09 11:45:32 -07:00 committed by GitHub
parent c83062aeb3 c357416682
commit dd1d71890d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_includes/partner-script.js
View File

@ -263,7 +263,7 @@
type: 0, type: 0,
name: 'Tigera', name: 'Tigera',
logo: 'tigera', logo: 'tigera',
link: 'http://docs.projectcalico.org/v1.5/getting-started/kubernetes/', link: 'http://docs.projectcalico.org/latest/getting-started/kubernetes/',
blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.' blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.'
}, },
{ {

4
docs/setup/independent/create-cluster-kubeadm.md
View File

@ -211,14 +211,14 @@ Please select one of the tabs to see installation instructions for the respectiv
{% capture calico %} {% capture calico %}
The official Calico guide is [here](http://docs.projectcalico.org/v2.3/getting-started/kubernetes/installation/hosted/kubeadm/) The official Calico guide is [here](http://docs.projectcalico.org/latest/getting-started/kubernetes/installation/hosted/kubeadm/)
**Note:** **Note:**
- In order for Network Policy to work correctly, you need to pass `--pod-network-cidr=192.168.0.0/16` to `kubeadm init` - In order for Network Policy to work correctly, you need to pass `--pod-network-cidr=192.168.0.0/16` to `kubeadm init`
- Calico works on `amd64` only. - Calico works on `amd64` only.
```shell ```shell
kubectl apply -f http://docs.projectcalico.org/v2.3/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml kubectl apply -f http://docs.projectcalico.org/v2.4/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml
``` ```
{% endcapture %} {% endcapture %}

6
docs/tabs-example.md
View File

@ -14,7 +14,7 @@ Select one of the tabs.
{% capture calico %} {% capture calico %}
```shell ```shell
kubectl apply -f "http://docs.projectcalico.org/v2.0/getting-started/kubernetes/installation/hosted/kubeadm/calico.yaml" kubectl apply -f "http://docs.projectcalico.org/v2.4/getting-started/kubernetes/installation/hosted/kubeadm/calico.yaml"
``` ```
{% endcapture %} {% endcapture %}
@ -54,7 +54,7 @@ Select one of the tabs.
{{ "{% capture calico " }}%} {{ "{% capture calico " }}%}
```shell ```shell
kubectl apply -f "http://docs.projectcalico.org/v2.0/getting-started/kubernetes/installation/hosted/kubeadm/calico.yaml" kubectl apply -f "http://docs.projectcalico.org/v2.4/getting-started/kubernetes/installation/hosted/kubeadm/calico.yaml"
``` ```
{{ "{% endcapture " }}%} {{ "{% endcapture " }}%}
@ -87,7 +87,7 @@ kubectl apply -f "https://git.io/weave-kube"
````liquid ````liquid
{{ "{% capture calico " }}%} {{ "{% capture calico " }}%}
```shell ```shell
kubectl apply -f "http://docs.projectcalico.org/v2.0/getting-started/kubernetes/installation/hosted/kubeadm/calico.yaml" kubectl apply -f "http://docs.projectcalico.org/v2.4/getting-started/kubernetes/installation/hosted/kubeadm/calico.yaml"
``` ```
{{ "{% endcapture " }}%} {{ "{% endcapture " }}%}
```` ````