hack/quickstart: Use env file to keep track of master label/taint (#981)

Author: rphillips

hack/quickstart/init-master.sh

@@ -102,6 +102,9 @@ function init_master_node() {
     # Set cloud provider
     sed -i "s/cloud-provider=/cloud-provider=$CLOUD_PROVIDER/" /etc/systemd/system/kubelet.service
 
+    # Configure master label and taint
+    echo -e 'node_label=node-role.kubernetes.io/master\nnode_taint=node-role.kubernetes.io/master=:NoSchedule' > /etc/kubernetes/kubelet.env
+
     # Start the kubelet
     systemctl enable kubelet; sudo systemctl start kubelet
 
@@ -119,8 +122,8 @@ if [ "${REMOTE_HOST}" != "local" ]; then
     wait_for_ssh
 
     # Set up the kubelet.service on remote host
-    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.master ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/kubelet.master
-    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} ${REMOTE_USER}@${REMOTE_HOST} "sudo mv /home/${REMOTE_USER}/kubelet.master /etc/systemd/system/kubelet.service"
+    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.service ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/kubelet.service
+    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} ${REMOTE_USER}@${REMOTE_HOST} "sudo mv /home/${REMOTE_USER}/kubelet.service /etc/systemd/system/kubelet.service"
 
     # Copy bootkube binary to remote host.
     if [ -e "../../_output/bin/linux/bootkube" ]; then

hack/quickstart/init-node.sh

@@ -52,6 +52,11 @@ function init_worker_node() {
     # Set cloud provider
     sed -i "s/cloud-provider=/cloud-provider=$CLOUD_PROVIDER/" /etc/systemd/system/kubelet.service
 
+    if [ "$TAG_MASTER" = true ] ; then
+        # Configure master label and taint
+        echo -e 'node_label=node-role.kubernetes.io/master\nnode_taint=node-role.kubernetes.io/master=:NoSchedule' > /etc/kubernetes/kubelet.env
+    fi
+
     # Start services
     systemctl daemon-reload
     systemctl stop locksmithd; systemctl mask locksmithd
@@ -68,16 +73,12 @@ if [ "${REMOTE_HOST}" != "local" ]; then
     wait_for_ssh
 
     # Copy kubelet service file and kubeconfig to remote host
-    if [ "$TAG_MASTER" = true ] ; then
-        scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.master ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/kubelet.service
-    else
-        scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.worker ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/kubelet.service
-    fi
+    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.service ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/kubelet.service
     scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ${KUBECONFIG} ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/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]} ${REMOTE_USER}@${REMOTE_HOST}:/home/${REMOTE_USER}/init-node.sh
-    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} ${REMOTE_USER}@${REMOTE_HOST} "sudo REMOTE_USER=${REMOTE_USER} CLOUD_PROVIDER=${CLOUD_PROVIDER} /home/${REMOTE_USER}/init-node.sh local /home/${REMOTE_USER}/kubeconfig"
+    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} ${REMOTE_USER}@${REMOTE_HOST} "sudo REMOTE_USER=${REMOTE_USER} TAG_MASTER=$TAG_MASTER CLOUD_PROVIDER=${CLOUD_PROVIDER} /home/${REMOTE_USER}/init-node.sh local /home/${REMOTE_USER}/kubeconfig"
 
     # Cleanup
     ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} ${REMOTE_USER}@${REMOTE_HOST} "rm /home/${REMOTE_USER}/{init-node.sh,kubeconfig}"

hack/quickstart/kubelet.master hack/quickstart/kubelet.servicehack/quickstart/kubelet.master renamed to hack/quickstart/kubelet.service

@@ -1,4 +1,5 @@
 [Service]
+EnvironmentFile=-/etc/kubernetes/kubelet.env
 Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
 Environment=KUBELET_IMAGE_TAG=v1.10.2
 Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
@@ -37,9 +38,9 @@ ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --maximum-dead-containers-per-container=${KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER} \
   --minimum-container-ttl-duration=${KUBELET_MINIMUM_CONTAINER_TTL_DURATION} \
   --network-plugin=cni \
-  --node-labels=node-role.kubernetes.io/master \
+  --node-labels=${node_label} \
   --pod-manifest-path=/etc/kubernetes/manifests \
-  --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
+  --register-with-taints=${node_taint} \
   --rotate-certificates
 ExecStop=-/usr/bin/rkt stop --uuid-file=/var/cache/kubelet-pod.uuid
 Restart=always