Merge pull request #554 from roberthbailey/gce-quickstart

Cleanups to the gce quickstart now that #543 has merged.

Author: aaronlevy

hack/quickstart/init-master.sh

@@ -116,7 +116,7 @@ if [ "${REMOTE_HOST}" != "local" ]; then
     echo "kubectl --kubeconfig=${CLUSTER_DIR}/auth/kubeconfig get nodes"
     echo
     echo "Additional nodes can be added to the cluster using:"
-    echo "./init-worker.sh <node-ip> ${CLUSTER_DIR}/auth/kubeconfig"
+    echo "./init-node.sh <node-ip> ${CLUSTER_DIR}/auth/kubeconfig"
     echo
 
 # Execute this script locally on the machine, assumes a kubelet.service file has already been placed on host.

hack/quickstart/quickstart-gce.md

@@ -21,7 +21,7 @@ $ gcloud compute instances create ${CLUSTER_PREFIX}-core1 \
 Tag the first node as an apiserver node, and allow traffic to 443 on that node.
 
 ```
-$ gcloud compute instances add-tags ${CLUSTER_PREFIX}-core1 --tags ${CLUSTER_PREFIX}-apiserver
+$ gcloud compute instances add-tags ${CLUSTER_PREFIX}-core1 --tags ${CLUSTER_PREFIX}-apiserver --zone us-central1-a
 $ gcloud compute firewall-rules create ${CLUSTER_PREFIX}-443 --target-tags=${CLUSTER_PREFIX}-apiserver --allow tcp:443
 ```
 
@@ -30,7 +30,7 @@ $ gcloud compute firewall-rules create ${CLUSTER_PREFIX}-443 --target-tags=${CLU
 *Replace* `<node-ip>` with the EXTERNAL_IP from output of `gcloud compute instances list ${CLUSTER_PREFIX}-core1`.
 
 ```
-$ IDENT=~/.ssh/google_compute_engine ./init-master.sh <node-ip>
+$ REMOTE_USER=$USER IDENT=~/.ssh/google_compute_engine ./init-master.sh <node-ip>
 ```
 
 After the master bootstrap is complete, you can continue to add worker nodes. Or cluster state can be inspected via kubectl:
@@ -53,7 +53,7 @@ $ gcloud compute instances list ${CLUSTER_PREFIX}-core3
 Initialize each worker node by replacing `<node-ip>` with the EXTERNAL_IP from the commands above.
 
 ```
-$ IDENT=~/.ssh/google_compute_engine ./init-node.sh <node-ip> cluster/auth/kubeconfig
+$ REMOTE_USER=$USER IDENT=~/.ssh/google_compute_engine ./init-node.sh <node-ip> cluster/auth/kubeconfig
 ```
 
 **NOTE:** It can take a few minutes for each node to download all of the required assets / containers.