Skip to content

Commit 3a80c64

Browse files
author
Ian Campbell
committed
boot.sh: Make way for non-kubeadm related metadata
Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 163fbd8 commit 3a80c64

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

boot.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ fi
8585
mkdir -p "${state}"
8686
touch $state/metadata.json
8787
if [ -n "${kubeadm_data}" ] ; then
88-
echo "{ \"kubeadm\": { \"entries\": { ${kubeadm_data} } } }" > $state/metadata.json
88+
metadata="${metadata:+$metadata, }\"kubeadm\": { \"entries\": { ${kubeadm_data} } }"
89+
fi
90+
if [ -n "${metadata}" ] ; then
91+
metadata="{ ${metadata} }"
92+
echo "${metadata}" > $state/metadata.json
8993
fi
9094

9195
exec linuxkit run ${KUBE_RUN_ARGS} -networking ${KUBE_NETWORKING} -cpus ${KUBE_VCPUS} -mem ${KUBE_MEM} -state "${state}" -disk size=${KUBE_DISK} -data-file $state/metadata.json ${uefi} "${img}${suffix}"

0 commit comments

Comments
 (0)