Merge pull request #28448 from thockin/gce-pd-discard

Automatic merge from submit-queue Mount r/w GCE PD disks with -o discard As per https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting. Fixes #23258

Merge pull request #28448 from thockin/gce-pd-discard
939b9848 · k8s-merge-robot · GitHub · 3895cede · 8efefab9 · 939b9848
Commit 939b9848 authored Jul 07, 2016 by k8s-merge-robot Committed by GitHub Jul 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

attacher.go pkg/volume/gce_pd/attacher.go +3 -0

No files found.
--- a/pkg/volume/gce_pd/attacher.go
+++ b/pkg/volume/gce_pd/attacher.go
@@ -165,6 +165,9 @@ func (attacher *gcePersistentDiskAttacher) MountDevice(spec *volume.Spec, device
 	options := []string{}
 	if readOnly {
 		options = append(options, "ro")
+	} else {
+		// as per https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting
+		options = append(options, "discard")
 	}
 	if notMnt {
 		diskMounter := &mount.SafeFormatAndMount{Interface: mounter, Runner: exec.New()}