Merge pull request kubernetes#84301 from yutedz/pvc-expand-fail

k8s-ci-robot · web-flow · commit a45917008fd6 · 2019-10-28T14:09:29.000-07:00
Add event for pvc in case node expansion fails
diff --git a/pkg/volume/util/operationexecutor/operation_generator.go b/pkg/volume/util/operationexecutor/operation_generator.go
@@ -1740,6 +1740,7 @@ func (og *operationGenerator) nodeExpandVolume(volumeToMount VolumeToMount, rsOp
 				simpleMsg, detailedMsg := volumeToMount.GenerateMsg("MountVolume.NodeExpandVolume failed", "requested read-only file system")
 				klog.Warningf(detailedMsg)
 				og.recorder.Eventf(volumeToMount.Pod, v1.EventTypeWarning, kevents.FileSystemResizeFailed, simpleMsg)
+				og.recorder.Eventf(pvc, v1.EventTypeWarning, kevents.FileSystemResizeFailed, simpleMsg)
 				return true, nil
 			}
 			rsOpts.VolumeSpec = volumeToMount.VolumeSpec

Original file line number	Diff line number	Diff line change
`@@ -1740,6 +1740,7 @@ func (og *operationGenerator) nodeExpandVolume(volumeToMount VolumeToMount, rsOp`
`1740`	`1740`	`simpleMsg, detailedMsg := volumeToMount.GenerateMsg("MountVolume.NodeExpandVolume failed", "requested read-only file system")`
`1741`	`1741`	`klog.Warningf(detailedMsg)`
`1742`	`1742`	`og.recorder.Eventf(volumeToMount.Pod, v1.EventTypeWarning, kevents.FileSystemResizeFailed, simpleMsg)`
	`1743`	`+ og.recorder.Eventf(pvc, v1.EventTypeWarning, kevents.FileSystemResizeFailed, simpleMsg)`
`1743`	`1744`	`return true, nil`
`1744`	`1745`	`}`
`1745`	`1746`	`rsOpts.VolumeSpec = volumeToMount.VolumeSpec`