Merge pull request #25306 from pmorie/configmap-medium

Automatic merge from submit-queue Use local disk for ConfigMap volume instead of tmpfs So that ConfigMap volumes are counted against pod's storage quota. @kubernetes/sig-node cc @derekwaynecarr @vishh
kubernetes · May 13, 2016 · 4591aa0 · 4591aa0
2 parents b7e2e2b + 3567b1f
commit 4591aa0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/volume/configmap/configmap.go b/pkg/volume/configmap/configmap.go
@@ -107,7 +107,10 @@ func (sv *configMapVolume) GetAttributes() volume.Attributes {
 
 // This is the spec for the volume that this plugin wraps.
 var wrappedVolumeSpec = volume.Spec{
-	Volume: &api.Volume{VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageMediumMemory}}},
+	// This should be on a tmpfs instead of the local disk; the problem is
+	// charging the memory for the tmpfs to the right cgroup.  We should make
+	// this a tmpfs when we can do the accounting correctly.
+	Volume: &api.Volume{VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}},
 }
 
 func (b *configMapVolumeMounter) SetUp(fsGroup *int64) error {