kubernetes: use image labels to simplify yaml requirements

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

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-07-14 17:28:56 +01:00
parent f853fab1f9
commit 20c0d080df
3 changed files with 1 additions and 28 deletions

View File

@ -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

View File

@ -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

View File

@ -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"}'