From e1da0ac2bbeb4d769a37cf6c924599322dc944ab Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Wed, 15 Nov 2017 10:20:50 +0000
Subject: [PATCH] kubernetes: Adjust boot.sh for #2703 (multi-level metadata
 support)

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 projects/kubernetes/boot.sh  | 8 ++++----
 projects/kubernetes/kube.yml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/kubernetes/boot.sh b/projects/kubernetes/boot.sh
index 7cd5423bf..60c42d1d3 100755
--- a/projects/kubernetes/boot.sh
+++ b/projects/kubernetes/boot.sh
@@ -28,10 +28,10 @@ if [ $# -eq 0 ] ; then
     # then we configure for auto init. If it is completely unset then
     # we do not.
     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
     if [ "${KUBE_MASTER_UNTAINT}" = "y" ] ; then
-	kubeadm_data="${kubeadm_data+$kubeadm_data, }\"untaint-master\": \"\""
+	kubeadm_data="${kubeadm_data+$kubeadm_data, }\"untaint-master\": { \"content\": \"\" }"
     fi
 
     state="kube-master-state"
@@ -56,7 +56,7 @@ elif [ $# -ge 1 ] ; then
     shift
 
     if [ $# -ge 1 ] ; then
-	kubeadm_data="\"join\": \"${*}\""
+	kubeadm_data="\"join\": { \"content\": \"${*}\" }"
     fi
 
     state="kube-${name}-state"
@@ -74,7 +74,7 @@ else
 fi
 
 if [ -n "${kubeadm_data}" ] ; then
-    data="{ \"kubeadm\": { ${kubeadm_data} } }"
+    data="{  \"kubeadm\": { \"entries\": { ${kubeadm_data} } } }"
 fi
 
 set -x
diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml
index cb78dec36..de5216168 100644
--- a/projects/kubernetes/kube.yml
+++ b/projects/kubernetes/kube.yml
@@ -18,7 +18,7 @@ onboot:
     image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d
+    image: linuxkit/metadata:026aca5c08c22589a7e319f79449bef2c65f04c5
   - name: format
     image: linuxkit/format:10e75e78e1f134d310c62e9a0352df1c67b0dd81
   - name: mounts