Merge pull request #515 from pbx0/tfmaster

support bringing up more masters in terraform and quickstart scripts

Author: Patrick Baxter

hack/quickstart/init-worker.sh hack/quickstart/init-node.shhack/quickstart/init-worker.sh renamed to hack/quickstart/init-node.sh

@@ -6,6 +6,7 @@ KUBECONFIG=$2
 REMOTE_PORT=${REMOTE_PORT:-22}
 IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
 SSH_OPTS=${SSH_OPTS:-}
+TAG_MASTER=${TAG_MASTER:-false}
 
 function usage() {
     echo "USAGE:"
@@ -23,7 +24,7 @@ function init_worker_node() {
     # CA here manually.
     grep 'certificate-authority-data' ${KUBECONFIG} | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt
 
-    mv /home/core/kubelet.worker /etc/systemd/system/kubelet.service
+    mv /home/core/kubelet.service /etc/systemd/system/kubelet.service
 
     # Start services
     systemctl daemon-reload
@@ -38,15 +39,19 @@ function init_worker_node() {
 if [ "${REMOTE_HOST}" != "local" ]; then
 
     # Copy kubelet service file and kubeconfig to remote host
-    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.worker core@${REMOTE_HOST}:/home/core/kubelet.worker
+    if [ "$TAG_MASTER" = true ] ; then
+        scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.master core@${REMOTE_HOST}:/home/core/kubelet.service
+    else
+        scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.worker core@${REMOTE_HOST}:/home/core/kubelet.service
+    fi
     scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ${KUBECONFIG} core@${REMOTE_HOST}:/home/core/kubeconfig
 
     # Copy self to remote host so script can be executed in "local" mode
-    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ${BASH_SOURCE[0]} core@${REMOTE_HOST}:/home/core/init-worker.sh
-    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo /home/core/init-worker.sh local /home/core/kubeconfig"
+    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ${BASH_SOURCE[0]} core@${REMOTE_HOST}:/home/core/init-node.sh
+    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo /home/core/init-node.sh local /home/core/kubeconfig"
 
     # Cleanup
-    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "rm /home/core/init-worker.sh"
+    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "rm /home/core/init-node.sh"
 
     echo
     echo "Node bootstrap complete. It may take a few minutes for the node to become ready. Access your kubernetes cluster using:"

hack/quickstart/quickstart-aws.md

@@ -68,7 +68,7 @@ $ kubectl --kubeconfig=cluster/auth/kubeconfig get nodes
 Run the `Launch Nodes` step for each additional node you wish to add, then using the public-ip, run:
 
 ```
-IDENT=${CLUSTER_PREFIX}-key.pem ./init-worker.sh <PUBLIC_IP> cluster/auth/kubeconfig
+IDENT=${CLUSTER_PREFIX}-key.pem ./init-node.sh <PUBLIC_IP> cluster/auth/kubeconfig
 ```
 
 **NOTE:** It can take a few minutes for each node to download all of the required assets / containers.

hack/quickstart/quickstart-gce.md

@@ -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-worker.sh <node-ip> cluster/auth/kubeconfig
+$ 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.

hack/terraform-quickstart/main.tf

@@ -25,6 +25,17 @@ resource "aws_instance" "worker_node" {
   }
 }
 
+resource "aws_instance" "master_node" {
+  ami           = "${data.aws_ami.coreos_ami.image_id}"
+  instance_type = "m3.medium"
+  key_name      = "${var.ssh_key}"
+  count         = "${var.additional_masters}"
+
+  tags {
+    Name = "${var.instance_tags}"
+  }
+}
+
 data "aws_ami" "coreos_ami" {
   most_recent = true
 

hack/terraform-quickstart/outputs.tf

@@ -6,6 +6,10 @@ output "worker_ips" {
   value = ["${aws_instance.worker_node.*.public_ip}"]
 }
 
+output "master_ips" {
+  value = ["${aws_instance.master_node.*.public_ip}"]
+}
+
 output "self_host_etcd" {
   value = "${var.self_host_etcd}"
 }

hack/terraform-quickstart/start-cluster.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 
 export BOOTSTRAP_IP=`terraform output bootstrap_node_ip`
 export WORKER_IPS=`terraform output -json worker_ips | jq -r '.value[]'`
+export MASTER_IPS=`terraform output -json master_ips | jq -r '.value[]'`
 export SELF_HOST_ETCD=`terraform output self_host_etcd`
 export SSH_OPTS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
@@ -11,5 +12,10 @@ cd ../quickstart
 
 for IP in $WORKER_IPS
 do
-  ./init-worker.sh $IP cluster/auth/kubeconfig
+  ./init-node.sh $IP cluster/auth/kubeconfig
+done
+
+for IP in $MASTER_IPS
+do
+  TAG_MASTER=true ./init-node.sh $IP cluster/auth/kubeconfig
 done

hack/terraform-quickstart/variables.tf

@@ -27,6 +27,12 @@ variable "num_workers" {
   default     = "1"
 }
 
+variable "additional_masters" {
+  description = "number of additional master nodes not including bootstrap node"
+  type        = "string"
+  default     = "0"
+}
+
 variable "region" {
   description = "aws region"
   type        = "string"

hack/tests/conformance-gce.sh

@@ -22,7 +22,7 @@ set -euo pipefail
 #   - Use gcloud to launch master node
 #     - Use the quickstart init-master.sh script to run bootkube on that node
 #   - Use gcloud to launch worker node(s)
-#     - Use the quickstart init-worker.sh script to join node to kubernetes cluster
+#     - Use the quickstart init-node.sh script to join node to kubernetes cluster
 #   - Run conformance tests against the launched cluster
 #
 COREOS_CHANNEL=${COREOS_CHANNEL:-'coreos-stable'}
@@ -83,7 +83,7 @@ function add_workers {
         sleep 30 # TODO(aaron) Have seen "Too many authentication failures" in CI jobs. This seems to help, but should dig into why
         echo "Getting worker public IP"
         local WORKER_IP=$(gcloud compute instances list ${GCE_PREFIX}-w${i} --format=json | jq --raw-output '.[].networkInterfaces[].accessConfigs[].natIP')
-        cd /build/bootkube/hack/quickstart && SSH_OPTS="-o StrictHostKeyChecking=no" ./init-worker.sh ${WORKER_IP} /build/cluster/auth/kubeconfig
+        cd /build/bootkube/hack/quickstart && SSH_OPTS="-o StrictHostKeyChecking=no" ./init-node.sh ${WORKER_IP} /build/cluster/auth/kubeconfig
     done
 }