From ea057a53f04b3ea1207b5971649c618f621a0e61 Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 6 May 2016 15:44:40 +0100 Subject: [PATCH] Allow configMaps to be mounted as volumes. See http://stackoverflow.com/questions/36187624/kubernetes-configmap-volume-doesnt-create-file-in-container --- Makefile | 2 +- pkg/localkubectl/controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e509bf2c..b064b8c9 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ DOCKER_DIR := /go/src/$(PKG) MNT_ROOT ?= -v "/:/rootfs:ro" MNT_SYS ?= -v "/sys:/sys:rw" MNT_DOCKER_LIB ?= -v "/var/lib/docker:/var/lib/docker" -v "/mnt/sda1/var/lib/docker:/mnt/sda1/var/lib/docker" -MNT_KUBELET_LIB ?= -v "/var/lib/kubelet:/var/lib/kubelet" +MNT_KUBELET_LIB ?= -v "/var/lib/kubelet:/var/lib/kubelet:rw,shared" MNT_RUN ?= -v "/var/run:/var/run:rw" MNT_REPO ?= -v "$(mkfile_dir):$(DOCKER_DIR)" diff --git a/pkg/localkubectl/controller.go b/pkg/localkubectl/controller.go index 04aab1bd..6728a945 100644 --- a/pkg/localkubectl/controller.go +++ b/pkg/localkubectl/controller.go @@ -156,7 +156,7 @@ func (d *Controller) StartCtr(ctrId, etcdDataDir string) error { "/sys:/sys:rw", "/var/lib/docker:/var/lib/docker", "/mnt/sda1/var/lib/docker:/mnt/sda1/var/lib/docker", - "/var/lib/kubelet:/var/lib/kubelet", + "/var/lib/kubelet:/var/lib/kubelet:rw,shared", "/var/run:/var/run:rw", "/:/rootfs:ro", }