github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28646 from kubernetes/revert-28448-gce-pd-discard

Browse Source 
Automatic merge from submit-queue

Revert "Mount r/w GCE PD disks with -o discard"

Reverts kubernetes/kubernetes#28448

We need to make sure that we check for compatibility with the discard flag before mounting with it.
This commit is contained in:
k8s-merge-robot 2016-07-08 05:26:23 -07:00 committed by GitHub
commit becb3b44e7
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/volume/gce_pd/attacher.go
View File

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