github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2441 from justincormack/kubernetes-mkdir

Browse Source 
Use new runtime mkdir instead of mkdir container
This commit is contained in:
Justin Cormack 2017-08-21 13:35:15 +01:00 committed by GitHub
commit 2acb7151fb
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
projects/kubernetes/kube-master.yml
View File

@ -21,11 +21,6 @@ onboot:
- name: mounts - name: mounts
image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08
command: ["/usr/bin/mountie", "/var/lib/"] command: ["/usr/bin/mountie", "/var/lib/"]
- name: var
image: library/alpine:3.6
command: ["mkdir", "/var/lib/kubeadm"]
binds:
- /var/lib:/var/lib
services: services:
- name: getty - name: getty
image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec
@ -56,12 +51,16 @@ services:
- /opt/cni:/opt/cni:rshared,rbind - /opt/cni:/opt/cni:rshared,rbind
rootfsPropagation: shared rootfsPropagation: shared
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
runtime:
mkdir: ["/var/lib/kubeadm"]
- name: kubernetes-image-cache-common - name: kubernetes-image-cache-common
image: linuxkitprojects/kubernetes-image-cache-common:ba16b1f8cfe4f415a5946d521e59f67eaeecd9ce image: linuxkitprojects/kubernetes-image-cache-common:ba16b1f8cfe4f415a5946d521e59f67eaeecd9ce
- name: kubernetes-image-cache-control-plane - name: kubernetes-image-cache-control-plane
image: linuxkitprojects/kubernetes-image-cache-control-plane:ba16b1f8cfe4f415a5946d521e59f67eaeecd9ce image: linuxkitprojects/kubernetes-image-cache-control-plane:ba16b1f8cfe4f415a5946d521e59f67eaeecd9ce
- name: kubelet - name: kubelet
image: linuxkitprojects/kubernetes:bbf14d70199babeea1f71f5b0bd70c1c1c9b5cd2 image: linuxkitprojects/kubernetes:bbf14d70199babeea1f71f5b0bd70c1c1c9b5cd2
runtime:
mkdir: ["/var/lib/kubeadm"]
files: files:
- path: root/.ssh/authorized_keys - path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub source: ~/.ssh/id_rsa.pub

9
projects/kubernetes/kube-node.yml
View File

@ -21,11 +21,6 @@ onboot:
- name: mounts - name: mounts
image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08
command: ["/usr/bin/mountie", "/var/lib/"] command: ["/usr/bin/mountie", "/var/lib/"]
- name: var
image: library/alpine:3.6
command: ["mkdir", "/var/lib/kubeadm"]
binds:
- /var/lib:/var/lib
services: services:
- name: getty - name: getty
image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec
@ -56,10 +51,14 @@ services:
- /opt/cni:/opt/cni:rshared,rbind - /opt/cni:/opt/cni:rshared,rbind
rootfsPropagation: shared rootfsPropagation: shared
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
runtime:
mkdir: ["/var/lib/kubeadm"]
- name: kubernetes-image-cache-common - name: kubernetes-image-cache-common
image: linuxkitprojects/kubernetes-image-cache-common:ba16b1f8cfe4f415a5946d521e59f67eaeecd9ce image: linuxkitprojects/kubernetes-image-cache-common:ba16b1f8cfe4f415a5946d521e59f67eaeecd9ce
- name: kubelet - name: kubelet
image: linuxkitprojects/kubernetes:bbf14d70199babeea1f71f5b0bd70c1c1c9b5cd2 image: linuxkitprojects/kubernetes:bbf14d70199babeea1f71f5b0bd70c1c1c9b5cd2
runtime:
mkdir: ["/var/lib/kubeadm"]
files: files:
- path: root/.ssh/authorized_keys - path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub source: ~/.ssh/id_rsa.pub