mirror of https://github.com/k3s-io/k3s
6dfc4b38fb
Automatic merge from submit-queue (batch tested with PRs 57702, 57128). 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>. format error message and remove duplicated event for resize volume failure **What this PR does / why we need it**: 1. The `operationGenerator.resizeFileSystem` method returns errors generated by `volumeToMount.GenerateErrorDetailed`, and the outside code(`operationGenerator.GenerateMountVolumeFunc`) uses `volumeToMount.GenerateError` to generate a new error again, which lead to the event message redundant and confused, we should use `volumeToMount.GenerateError` inside `operationGenerator.resizeFileSystem` only, in outside code is not necessary. 2. The `eventRecorderFunc` will record an event if `resizeFileSystem` returns an error, so we needn't to record event inside `resizeFileSystem` itself. **Release note**: ```release-note NONE ``` /sig storage /kind enhancement |
||
|---|---|---|
| .. | ||
| nestedpendingoperations | ||
| operationexecutor | ||
| types | ||
| volumehelper | ||
| BUILD | ||
| OWNERS | ||
| atomic_writer.go | ||
| atomic_writer_test.go | ||
| device_util.go | ||
| device_util_linux.go | ||
| device_util_linux_test.go | ||
| device_util_unsupported.go | ||
| doc.go | ||
| error.go | ||
| finalizer.go | ||
| fs.go | ||
| fs_unsupported.go | ||
| io_util.go | ||
| metrics.go | ||
| util.go | ||
| util_linux.go | ||
| util_test.go | ||
| util_unsupported.go | ||