Skip to content

K
k3s
Commit 4591aa0f authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

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
parents b7e2e2b4 3567b1f9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
pkg/volume/configmap/configmap.go
View file @ 4591aa0f
...@@ -107,7 +107,10 @@ func (sv *configMapVolume) GetAttributes() volume.Attributes { ...@@ -107,7 +107,10 @@ func (sv *configMapVolume) GetAttributes() volume.Attributes {
// This is the spec for the volume that this plugin wraps. // This is the spec for the volume that this plugin wraps.
var wrappedVolumeSpec = volume.Spec{ 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 { func (b *configMapVolumeMounter) SetUp(fsGroup *int64) error {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment