Merge pull request #56587 from gnufied/remove-conditions-after-resize

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Do not do fs resize on read-only mount We should not perform file system resize when volume is mounted in read-only mode. Fixes : https://github.com/kubernetes/kubernetes/issues/56588 ```release-note Do not do file system resize on read-only mounts ```

Merge pull request #56587 from gnufied/remove-conditions-after-resize
9e3791c8 · Kubernetes Submit Queue · GitHub · 16027080 · c82d4129 · 9e3791c8
Unverified Commit 9e3791c8 authored Nov 30, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

operation_generator.go pkg/volume/util/operationexecutor/operation_generator.go +9 -0

No files found.
--- a/pkg/volume/util/operationexecutor/operation_generator.go
+++ b/pkg/volume/util/operationexecutor/operation_generator.go
@@ -544,6 +544,7 @@ func (og *operationGenerator) resizeFileSystem(volumeToMount VolumeToMount, devi
 		glog.V(6).Infof("Resizing is not enabled for this volume %s", volumeToMount.VolumeName)
 		return nil
 	}
+
 	mounter := og.volumePluginMgr.Host.GetMounter(pluginName)
 	// Get expander, if possible
 	expandableVolumePlugin, _ :=
@@ -565,6 +566,13 @@ func (og *operationGenerator) resizeFileSystem(volumeToMount VolumeToMount, devi
 			// File system resize was requested, proceed
 			glog.V(4).Infof(volumeToMount.GenerateMsgDetailed("MountVolume.resizeFileSystem entering", fmt.Sprintf("DevicePath %q", volumeToMount.DevicePath)))

+			if volumeToMount.VolumeSpec.ReadOnly {
+				simpleMsg, detailedMsg := volumeToMount.GenerateMsg("MountVolume.resizeFileSystem failed", "requested read-only file system")
+				glog.Warningf(detailedMsg)
+				og.recorder.Eventf(volumeToMount.Pod, v1.EventTypeWarning, kevents.FileSystemResizeFailed, simpleMsg)
+				return nil
+			}
+
 			diskFormatter := &mount.SafeFormatAndMount{
 				Interface: mounter,
 				Exec:      og.volumePluginMgr.Host.GetExec(expandableVolumePlugin.GetPluginName()),
@@ -1272,6 +1280,7 @@ func updatePVCStatusCapacity(pvcName string, pvc *v1.PersistentVolumeClaim, capa
 	}

 	pvcCopy.Status.Capacity = capacity
+	pvcCopy.Status.Conditions = []v1.PersistentVolumeClaimCondition{}
 	newData, err := json.Marshal(pvcCopy)

 	if err != nil {