Skip to content

K
k3s
Commit becb3b44 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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

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.
parents 5504c58c 8028e953
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
pkg/volume/gce_pd/attacher.go
View file @ becb3b44
...@@ -165,9 +165,6 @@ func (attacher *gcePersistentDiskAttacher) MountDevice(spec *volume.Spec, device ...@@ -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()}
......
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