From 84f4f001bfb63ba28e232a256aa220c3570ab36c Mon Sep 17 00:00:00 2001 From: Jeff Mendoza Date: Tue, 18 Nov 2014 14:15:51 -0800 Subject: [PATCH 1/2] Update README.md Update Azure. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index c48b43758b3..ac0591d260d 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,6 @@ While the concepts and architecture in Kubernetes represent years of experience * [CloudStack](docs/getting-started-guides/cloudstack.md) * [Rackspace](docs/getting-started-guides/rackspace.md) * [vSphere](docs/getting-started-guides/vsphere.md) - -* The following clouds are currently broken at Kubernetes head. Please sync your client to `v0.3` (`git checkout v0.3`) to use these: * [Microsoft Azure](docs/getting-started-guides/azure.md) * [Kubernetes 101](examples/walkthrough) From cea70d51e7ece9de401e263bc314781896336725 Mon Sep 17 00:00:00 2001 From: Jeff Mendoza Date: Tue, 18 Nov 2014 14:23:03 -0800 Subject: [PATCH 2/2] Bring Azure guide up to date. --- docs/getting-started-guides/azure.md | 31 +++++++++++----------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/docs/getting-started-guides/azure.md b/docs/getting-started-guides/azure.md index b46b433a02e..5bfb55d29e1 100644 --- a/docs/getting-started-guides/azure.md +++ b/docs/getting-started-guides/azure.md @@ -1,30 +1,24 @@ -# WARNING -These instructions are broken at git HEAD. Please either: -* Sync back to `v0.3` with `git checkout v0.3` -* Download a [snapshot of `v0.3`](https://github.com/GoogleCloudPlatform/kubernetes/archive/v0.3.tar.gz) - ## Getting started on Microsoft Azure -### Prerequisites +### Azure Prerequisites 1. You need an Azure account. Visit http://azure.microsoft.com/ to get started. 2. Install and configure the Azure cross-platform command-line interface. http://azure.microsoft.com/en-us/documentation/articles/xplat-cli/ 3. Make sure you have a default account set in the Azure cli, using `azure account set` -4. You must have Go (version 1.2 or later) installed: [www.golang.org](http://www.golang.org). -5. Get the Kubernetes source: - git clone https://github.com/GoogleCloudPlatform/kubernetes.git +### Prerequisites for your workstation + +1. Be running a Linux or Mac OS X. +5. Get or build a [binary release](binary_release.md) +4. If you want to build your own release, you need to have [Docker +installed](https://docs.docker.com/installation/). On Mac OS X you can use +boot2docker. ### Setup The cluster setup scripts can setup Kubernetes for multiple targets. First modify `cluster/kube-env.sh` to specify azure: KUBERNETES_PROVIDER="azure" -Next build Kubernetes, package the release, and upload to Azure Storage: - - cd kubernetes - release/azure/release.sh - Next, specify an existing virtual network in `cluster/azure/config-defualt.sh`: AZ_VNET= @@ -35,16 +29,15 @@ You can then use the `cluster/kube-*.sh` scripts to manage your azure cluster, s cluster/kube-up.sh +The script above will start (by default) a single master VM along with 4 worker VMs. You +can tweak some of these parameters by editing `cluster/azure/config-default.sh`. + ### Running a container (simple version) -Once you have your instances up and running, the `hack/build-go.sh` script sets up -your Go workspace and builds the Go components. - -The `cluster/kubecfg.sh` script spins up two containers, running [Nginx](http://nginx.org/en/) and with port 80 mapped to 8080: +The `cluster/kubecfg.sh` command below spins up two containers, running [Nginx](http://nginx.org/en/) and with port 80 mapped to 8080: ``` cd kubernetes -hack/build-go.sh cluster/kubecfg.sh -p 8080:80 run dockerfile/nginx 2 myNginx ```