Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #12149 to 1.1.x release #12682

Merged
merged 1 commit into from
Apr 20, 2022
Merged

Backport #12149 to 1.1.x release #12682

merged 1 commit into from
Apr 20, 2022

Conversation

lgfa29
Copy link
Contributor

@lgfa29 lgfa29 commented Apr 19, 2022

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 existing mountPoint value instead of the new socketMountPoint to avoid pulling too much.

The Prestart hook for task runner hooks doesn't get called when we
restore a task, because the task is already running. The Postrun hook
for CSI plugin supervisors needs the socket path to have been
populated so that the client has a valid path.
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

I think in retrospect marking the CSI_ENDPOINT PR for backport was a mistake, as it was borderline a bug vs enhancement. But given that we've got it in, this PR looks like the right approach to fix that up. Thanks!

@lgfa29
Copy link
Contributor Author

lgfa29 commented Apr 20, 2022

It wasn't too bad, plus it brings the release branches a bit closer to main, which could be helpful in the future 🙂

@lgfa29 lgfa29 merged commit c714639 into release/1.1.x Apr 20, 2022
@lgfa29 lgfa29 deleted the backport-1.1.x-12149 branch April 20, 2022 16:57
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants