diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile index 052802810..71198c8c1 100644 --- a/projects/kubernetes/Makefile +++ b/projects/kubernetes/Makefile @@ -1,6 +1,6 @@ all: build-container-images build-vm-images -BOX_PLANS = kubernetes.rb mounts.rb +BOX_PLANS = kubernetes.rb build-container-images: $(BOX_PLANS) for plan in $(BOX_PLANS) ; do \ @@ -13,7 +13,6 @@ build-container-images: $(BOX_PLANS) push-container-images: build-container-images cache-images docker image push linuxkit/kubernetes:latest - docker image push linuxkit/kubernetes:latest-mounts docker image push linuxkit/kubernetes:latest-image-cache-common docker image push linuxkit/kubernetes:latest-image-cache-control-plane diff --git a/projects/kubernetes/common.rb b/projects/kubernetes/common.rb index b902cd0c1..d1a666e44 100644 --- a/projects/kubernetes/common.rb +++ b/projects/kubernetes/common.rb @@ -22,19 +22,3 @@ end def mount_bind src, dst "mount --bind #{src} #{dst}" end - -def mount_bind_hostns_self mnt - "nsenter --mount=/proc/1/ns/mnt mount -- --bind #{mnt} #{mnt}" -end - -def mount_make_hostns_rshared mnt - "nsenter --mount=/proc/1/ns/mnt mount -- --make-rshared #{mnt}" -end - -def mount_persistent_disk mnt - "/mount.sh #{mnt}" -end - -def mkdir_p dir - "mkdir -p #{dir}" -end diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 0445b5d70..f06ab0dd9 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -16,14 +16,13 @@ onboot: - name: format image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 - name: mounts - image: linuxkit/kubernetes:latest-mounts - capabilities: - - all - pid: host - rootfsPropagation: shared + image: linuxkit/mount:b24bd97ae43397b469dbaadd80f17f291c817bdf + command: ["/mount.sh", "/var/lib/"] + - name: var + image: library/alpine:3.6 + command: ["mkdir", "/var/lib/kubeadm"] binds: - - /dev:/dev - - /var:/var:rshared,rbind + - /var/lib:/var/lib services: - name: getty image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index cb757a7c2..165e52feb 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -16,14 +16,13 @@ onboot: - name: format image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 - name: mounts - image: linuxkit/kubernetes:latest-mounts - capabilities: - - all - pid: host - rootfsPropagation: shared + image: linuxkit/mount:b24bd97ae43397b469dbaadd80f17f291c817bdf + command: ["/mount.sh", "/var/lib/"] + - name: var + image: library/alpine:3.6 + command: ["mkdir", "/var/lib/kubeadm"] binds: - - /dev:/dev - - /var:/var:rshared,rbind + - /var/lib:/var/lib services: - name: getty image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 diff --git a/projects/kubernetes/mounts.rb b/projects/kubernetes/mounts.rb deleted file mode 100644 index a0cddb491..000000000 --- a/projects/kubernetes/mounts.rb +++ /dev/null @@ -1,15 +0,0 @@ -import 'common.rb' - -from "linuxkit/mount:ac8939c4102f97c084d9ddfd445c1908fce6d768" - -script = [ - mount_bind_hostns_self("/etc/cni"), mount_make_hostns_rshared("/etc/cni"), - mount_bind_hostns_self("/opt/cni"), mount_make_hostns_rshared("/opt/cni"), - mount_persistent_disk("/var/lib"), - mkdir_p("/var/lib/kubeadm"), -] - -create_shell_wrapper script.join(' && '), '/usr/bin/kube-mounts.sh' -set_exec cmd: [ '/usr/bin/kube-mounts.sh' ] - -tag "#{@image_name}:latest-mounts"