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

kubernetes: Adjust boot.sh for #2703 (multi-level metadata support)

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

8
projects/kubernetes/boot.sh
View File

@ -28,10 +28,10 @@ if [ $# -eq 0 ] ; then
# then we configure for auto init. If it is completely unset then # then we configure for auto init. If it is completely unset then
# we do not. # we do not.
if [ -n "${KUBE_MASTER_AUTOINIT+x}" ] ; then if [ -n "${KUBE_MASTER_AUTOINIT+x}" ] ; then
kubeadm_data="${kubeadm_data+$kubeadm_data, }\"init\": \"${KUBE_MASTER_AUTOINIT}\"" kubeadm_data="${kubeadm_data+$kubeadm_data, }\"init\": { \"content\": \"${KUBE_MASTER_AUTOINIT}\" }"
fi fi
if [ "${KUBE_MASTER_UNTAINT}" = "y" ] ; then if [ "${KUBE_MASTER_UNTAINT}" = "y" ] ; then
kubeadm_data="${kubeadm_data+$kubeadm_data, }\"untaint-master\": \"\"" kubeadm_data="${kubeadm_data+$kubeadm_data, }\"untaint-master\": { \"content\": \"\" }"
fi fi
state="kube-master-state" state="kube-master-state"
@ -56,7 +56,7 @@ elif [ $# -ge 1 ] ; then
shift shift
if [ $# -ge 1 ] ; then if [ $# -ge 1 ] ; then
kubeadm_data="\"join\": \"${*}\"" kubeadm_data="\"join\": { \"content\": \"${*}\" }"
fi fi
state="kube-${name}-state" state="kube-${name}-state"
@ -74,7 +74,7 @@ else
fi fi
if [ -n "${kubeadm_data}" ] ; then if [ -n "${kubeadm_data}" ] ; then
data="{ \"kubeadm\": { ${kubeadm_data} } }" data="{ \"kubeadm\": { \"entries\": { ${kubeadm_data} } } }"
fi fi
set -x set -x

2
projects/kubernetes/kube.yml
View File

@ -18,7 +18,7 @@ onboot:
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d image: linuxkit/metadata:026aca5c08c22589a7e319f79449bef2c65f04c5
- name: format - name: format
image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81 image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81
- name: mounts - name: mounts