From 20c0d080df089a47f627e33f34afcfe37ec4e3e1 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Fri, 14 Jul 2017 17:28:56 +0100
Subject: [PATCH] kubernetes: use image labels to simplify yaml requirements

Also `net: host` is the default, so drop.

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 projects/kubernetes/kube-master.yml       | 14 --------------
 projects/kubernetes/kube-node.yml         | 14 --------------
 projects/kubernetes/kubernetes/Dockerfile |  1 +
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml
index 9f4f3c791..296fd04ee 100644
--- a/projects/kubernetes/kube-master.yml
+++ b/projects/kubernetes/kube-master.yml
@@ -63,20 +63,6 @@ services:
       - /var/run:/var/run
   - name: kubelet
     image: linuxkitprojects/kubernetes:dev
-    capabilities:
-     - all
-    net: host
-    pid: host
-    mounts:
-     - type: cgroup
-       options: ["rw","nosuid","noexec","nodev","relatime"]
-    binds:
-     - /dev:/dev
-     - /var:/var:rshared,rbind
-     - /var/lib/kubeadm:/etc/kubernetes
-     - /etc/cni:/rootfs/etc/cni:rshared,rbind
-     - /opt/cni:/rootfs/opt/cni:rshared,rbind
-    rootfsPropagation: shared
 files:
   - path: root/.ssh/authorized_keys
     source: ~/.ssh/id_rsa.pub
diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml
index 2ce74321f..a28074651 100644
--- a/projects/kubernetes/kube-node.yml
+++ b/projects/kubernetes/kube-node.yml
@@ -59,20 +59,6 @@ services:
       - /var/run:/var/run
   - name: kubelet
     image: linuxkitprojects/kubernetes:dev
-    capabilities:
-     - all
-    net: host
-    pid: host
-    mounts:
-     - type: cgroup
-       options: ["rw","nosuid","noexec","nodev","relatime"]
-    binds:
-     - /dev:/dev
-     - /var:/var:rshared,rbind
-     - /var/lib/kubeadm:/etc/kubernetes
-     - /etc/cni:/rootfs/etc/cni:rshared,rbind
-     - /opt/cni:/rootfs/opt/cni:rshared,rbind
-    rootfsPropagation: shared
 files:
   - path: root/.ssh/authorized_keys
     source: ~/.ssh/id_rsa.pub
diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile
index 339be6085..3ddda9ca8 100644
--- a/projects/kubernetes/kubernetes/Dockerfile
+++ b/projects/kubernetes/kubernetes/Dockerfile
@@ -46,3 +46,4 @@ WORKDIR /
 ENTRYPOINT ["/usr/bin/kubelet.sh"]
 COPY --from=build /out /
 ENV KUBECONFIG "/etc/kubernetes/admin.conf"
+LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var:rshared,rbind", "/var/lib/kubeadm:/etc/kubernetes", "/etc/cni:/rootfs/etc/cni:rshared,rbind", "/opt/cni:/rootfs/opt/cni:rshared,rbind"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}], "capabilities": ["all"], "rootfsPropagation": "shared", "pid": "host"}'