github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

kubernetes: refactor final metadata construction to common location

Browse Source 
Shared between the master and node cases.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-11-15 10:09:09 +00:00
parent ea6ed3c354
commit 6659aa0815
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
projects/kubernetes/boot.sh
View File

@ -34,10 +34,6 @@ if [ $# -eq 0 ] ; then
kubeadm_data="${kubeadm_data+$kubeadm_data, }\"untaint-master\": \"\"" kubeadm_data="${kubeadm_data+$kubeadm_data, }\"untaint-master\": \"\""
fi fi
if [ -n "${kubeadm_data}" ] ; then
data="{ \"kubeadm\": { ${kubeadm_data} } }"
fi
state="kube-master-state" state="kube-master-state"
: ${KUBE_VCPUS:=$KUBE_MASTER_VCPUS} : ${KUBE_VCPUS:=$KUBE_MASTER_VCPUS}
@ -60,7 +56,7 @@ elif [ $# -ge 1 ] ; then
shift shift
if [ $# -ge 1 ] ; then if [ $# -ge 1 ] ; then
data="{\"kubeadm\": {\"join\": \"${*}\"} }" kubeadm_data="\"join\": \"${*}\""
fi fi
state="kube-${name}-state" state="kube-${name}-state"
@ -76,6 +72,11 @@ else
echo " ${0} <node> <join_args>" echo " ${0} <node> <join_args>"
exit 1 exit 1
fi fi
if [ -n "${kubeadm_data}" ] ; then
data="{ \"kubeadm\": { ${kubeadm_data} } }"
fi
set -x set -x
if [ -n "${KUBE_CLEAR_STATE}" ] ; then if [ -n "${KUBE_CLEAR_STATE}" ] ; then
rm -rf "${state}" rm -rf "${state}"