From 91c4278c779736149f0bafb89b5913b6fd461b8c Mon Sep 17 00:00:00 2001
From: Ilya Dmitrichenko <errordeveloper@gmail.com>
Date: Mon, 10 Apr 2017 06:24:59 +0100
Subject: [PATCH] Use new modular init containers, flatten kubelet image

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
---
 projects/kubernetes/Boxfile         |  2 ++
 projects/kubernetes/kube-master.yml | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/projects/kubernetes/Boxfile b/projects/kubernetes/Boxfile
index 8b8468635..c4545cc95 100644
--- a/projects/kubernetes/Boxfile
+++ b/projects/kubernetes/Boxfile
@@ -83,6 +83,8 @@ install_dependencies
 
 create_kubelet_wrapper
 
+flatten
+
 env KUBECONFIG: "/etc/kubernetes/admin.conf"
 
 set_exec entrypoint: %w(tini -s --), cmd: %w(kubelet.sh)
diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml
index 32df3aa0c..652e382a2 100644
--- a/projects/kubernetes/kube-master.yml
+++ b/projects/kubernetes/kube-master.yml
@@ -2,7 +2,10 @@ kernel:
   image: "mobylinux/kernel:4.9.x"
   cmdline: "console=ttyS0 console=tty0 page_poison=1"
 init:
-  - "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1"
+  - mobylinux/init:09a26d50c82fb32290513708d30e401cf7c6f916
+  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
+  - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
+  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
     image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
@@ -37,6 +40,14 @@ services:
      - CAP_NET_RAW
     net: host
     oomScoreAdj: -800
+  - name: sshd
+    image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd"
+    capabilities:
+     - all
+    net: host
+    pid: host
+    binds:
+     - /root/.ssh:/root/.ssh
   - name: docker
     image: "mobylinux/docker-ce:f6505961df89ca6b5d024f1ac5a6b986359786d1"
     capabilities:
@@ -69,6 +80,8 @@ services:
      - /var/log:/var/log #/var/log/containers
      - /etc/kubernetes:/etc/kubernetes
 files:
+  - path: root/.ssh/authorized_keys
+    contents: '# your ssh key goes here'
   - path: etc/kubernetes/
     directory: true
 outputs: