-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Replace FindExecutablePeer with FindHelperBinary when looking for gvproxy/win-sshproxy on WSL #27612
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
base: main
Are you sure you want to change the base?
Conversation
|
Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
| return nil | ||
| } | ||
|
|
||
| exe, err := machine.FindExecutablePeer(gvProxy) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is another user with win-sshproxy that hsould be repalced I think? Then we can delete this function as it would be no longer needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. I forgot to include the file in the commit. Should be fixed now.
go.mod
Outdated
| tags.cncf.io/container-device-interface/specs-go v1.0.1-0.20251120202831-139ffec09210 // indirect | ||
| ) | ||
|
|
||
| replace go.podman.io/common => github.com/containers/container-libs/common v0.66.1-0.20251126113141-baac55b96f3f |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you should run go get go.podman.io/storage@main && go get go.podman.io/image/v5@main && go get go.podman.io/common@main && make vendor to update the module without using a replace. Then we can merge this if it is updated properly.
The replace is only needed to point to different forks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't expect the merge to happen so rapidly. Thanks. I have done the vendoring properly now.
Signed-off-by: Mario Loriedo <[email protected]>
The WSL machine start was using the function FindExecutablePeer that ignores user configuration (helper_binaries_dir). FindHelperBinary instead is used when starting the machine for the rest of the providers and honors user configuration. This commit requires containers/container-libs@4877783 Signed-off-by: Mario Loriedo <[email protected]>
359deda to
f71b933
Compare
Luap99
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: l0rd, Luap99 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
The WSL machine start was using the function FindExecutablePeer that
ignores user configuration (helper_binaries_dir). FindHelperBinary
instead is used when starting the machine for the rest of the providers
and honors user configuration.
Checklist
Ensure you have completed the following checklist for your pull request to be reviewed:
commits. (
git commit -s). (If needed, usegit commit -s --amend). The author email must matchthe sign-off email address. See CONTRIBUTING.md
for more information.
Fixes: #00000in commit message (if applicable)make validatepr(format/lint checks)Noneif no user-facing changes)Does this PR introduce a user-facing change?