Backport #12149 to 1.1.x release #12682
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Manual backport of #12149 to include some required parts of #12078.
The main difference is the removal of this block that calls
PluginForAlloc
. This function was added in #12078 by backporting that PR didn't seem like a good choice since it represents a major change in the underlying volume mount point structure.So I only pulled the changes related to the new struct field
socketPath
and used the existingmountPoint
value instead of the newsocketMountPoint
to avoid pulling too much.