From f795b675218b0dc794ac0eb40806de0d38c7a699 Mon Sep 17 00:00:00 2001 From: Alexander Hersh Date: Tue, 18 Aug 2015 17:29:49 -0700 Subject: [PATCH 1/2] Update ubuntu-calico guide Update Release Versions and Repo Names. --- docs/getting-started-guides/ubuntu-calico.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/getting-started-guides/ubuntu-calico.md b/docs/getting-started-guides/ubuntu-calico.md index 35a2736e314..2225304570a 100644 --- a/docs/getting-started-guides/ubuntu-calico.md +++ b/docs/getting-started-guides/ubuntu-calico.md @@ -32,10 +32,9 @@ Documentation for other releases can be found at Kubernetes Deployment On Bare-metal Ubuntu Nodes with Calico Networking ------------------------------------------------ - ## Introduction -This document describes how to deploy Kubernetes on ubuntu bare metal nodes with Calico Networking plugin. See [projectcalico.org](http://projectcalico.org) for more information on what Calico is, and [the calicoctl github](https://github.com/Metaswitch/calico-docker) for more information on the command-line tool, `calicoctl`. +This document describes how to deploy Kubernetes on ubuntu bare metal nodes with Calico Networking plugin. See [projectcalico.org](http://projectcalico.org) for more information on what Calico is, and [the calicoctl github](https://github.com/projectcalico/calico-docker) for more information on the command-line tool, `calicoctl`. This guide will set up a simple Kubernetes cluster with a master and two nodes. We will start the following processes with systemd: @@ -91,7 +90,7 @@ sudo mv -f network-environment /etc ``` # Get the Kubernetes Source -wget https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.20.2/kubernetes.tar.gz +wget https://github.com/kubernetes/kubernetes/releases/download/v1.0.3/kubernetes.tar.gz # Untar it tar -xf kubernetes.tar.gz @@ -130,7 +129,7 @@ In order to allow the master to route to pods on our nodes, we will launch the c ``` # Install the calicoctl binary, which will be used to launch calico -wget https://github.com/Metaswitch/calico-docker/releases/download/v0.5.1/calicoctl +wget https://github.com/projectcalico/calico-docker/releases/download/v0.5.5/calicoctl chmod +x calicoctl sudo cp -f calicoctl /usr/bin @@ -207,7 +206,7 @@ The Docker daemon must be started and told to use the already configured cbr0 in ``` # Get the calicoctl binary -wget https://github.com/Metaswitch/calico-docker/releases/download/v0.5.1/calicoctl +wget https://github.com/projectcalico/calico-docker/releases/download/v0.5.5/calicoctl chmod +x calicoctl sudo cp -f calicoctl /usr/bin @@ -232,7 +231,7 @@ ETCD_AUTHORITY=:4001 calicoctl pool add 192.168.0.0/16 ``` # Get the Kubernetes Source -wget https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.20.2/kubernetes.tar.gz +wget https://github.com/kubernetes/kubernetes/releases/download/v1.0.3/kubernetes.tar.gz # Untar it tar -xf kubernetes.tar.gz From dc35afcada3d70b3267955908f5e669de91f5fc7 Mon Sep 17 00:00:00 2001 From: Alexander Hersh Date: Wed, 19 Aug 2015 22:33:03 -0700 Subject: [PATCH 2/2] update generated docs --- docs/getting-started-guides/ubuntu-calico.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/getting-started-guides/ubuntu-calico.md b/docs/getting-started-guides/ubuntu-calico.md index 2225304570a..2bc4c6768c7 100644 --- a/docs/getting-started-guides/ubuntu-calico.md +++ b/docs/getting-started-guides/ubuntu-calico.md @@ -32,6 +32,7 @@ Documentation for other releases can be found at Kubernetes Deployment On Bare-metal Ubuntu Nodes with Calico Networking ------------------------------------------------ + ## Introduction This document describes how to deploy Kubernetes on ubuntu bare metal nodes with Calico Networking plugin. See [projectcalico.org](http://projectcalico.org) for more information on what Calico is, and [the calicoctl github](https://github.com/projectcalico/calico-docker) for more information on the command-line tool, `calicoctl`.