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

Add gvproxy to windows packages #16807

Merged
merged 2 commits into from Jan 30, 2023
Merged

Conversation

arixmkii
Copy link
Contributor

@arixmkii arixmkii commented Dec 11, 2022

This adds gvproxy.exe (which is a requirement to use podman with Qemu on windows(#13006)) to Windows installers and zip builds.

Included changes:

  • commit hash reference of gvisor-tap-vsock is bumped to latest (to include unix domain socket support on Windows); (was fixed already in upstream)
  • wih-sshproxy build step is renamed to gvproxy (to match the repository name);
  • gvproxy build step is responsible for both artifacts - win-sshproxy.exe and gvproxy.exe;
  • gvproxy.exe added to zip archive;
  • gvproxy.exe added to msi build;
  • gvproxy.exe added to new Windows installer (unfortunately there is no fallback options as with win-sshproxy.exe, so, for packaging older versions - older version of script will be required);
  • fixes for building on Windows with msys2:
    • GOROOT is passed to go executable for host detection (as msys packages cine with GOROOT override), this assumed to be safe for other builds;
    • utf-8 encoding is enforced in python script; (was fixed already in upstream)
    • unix style line endings are enforced in python script;
    • added workaround with unlinking file before renaming in python script (as renaming behaves differently on Windows, when file exists);
    • removed explicit -in /dev/stdin from go-md2man as this a default (reads StdIn if not specified) and this triggers some regression in msys2 with latest updates.

This is extracted from my work on Qemu Podman Machine on Windows. It might look that there is no value in adding binary in advance, but I could challenge this with the statement, that it will be possible to launch gvproxy and Qemu VM manually and then setup podman remote connection to use it in a machine like scenario (without handy helpers of podman machine). If this can't be accepted int his form, I can move it to draft and add the description of this scenario to https://github.com/containers/podman/tree/main/docs/tutorials

Signed-off-by: Arthur Sengileyev arthur.sengileyev@gmail.com

Does this PR introduce a user-facing change?

gvproxy.exe added to Windows installers

@arixmkii
Copy link
Contributor Author

Added documentation how to setup QEMU machine with gvproxy and use it with podman.

@arixmkii
Copy link
Contributor Author

arixmkii commented Dec 17, 2022

Squashed commits. Added one more change - removed explicit "-in /dev/stdin" from go-md2man because there is a regression in how msys2 handles this input after some updates.

 open /proc/self/fd/0: The system cannot find the path specified.

Update: had to rebase to upstream head.

@arixmkii
Copy link
Contributor Author

arixmkii commented Jan 3, 2023

It is not forgotten. Will update the PR this week.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 7, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 8, 2023
@arixmkii
Copy link
Contributor Author

arixmkii commented Jan 8, 2023

Rebased. Description updates (as some fixes were already applied upstream).

@TomSweeneyRedHat I addressed the issues you pointed out in a separate commit. Taking into account amount feedback you contributed, should I mention you in Co-authored-by: section for that commit (I could not just accept suggestions, because I needed to rebase the code first)?

@arixmkii
Copy link
Contributor Author

arixmkii commented Jan 9, 2023

gvproxy team promised to upload latest artifacts to the releases page. I will then update the section removing gvproxy build instructions and replace it with a link.

Update: added the link and description to the latest commit.

@arixmkii
Copy link
Contributor Author

arixmkii commented Jan 9, 2023

I'm leaning towards adding [NO NEW TESTS NEEDED] if there no tests, which validates the content of Zip or exe artifacts.

@rhatdan
Copy link
Member

rhatdan commented Jan 10, 2023

SGTM, add no new test needed.

@rhatdan
Copy link
Member

rhatdan commented Jan 10, 2023

@n1hility PTAL

Copy link
Member

@n1hility n1hility left a comment

Choose a reason for hiding this comment

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

Looks good but have some suggestions here, mostly around docs. We were likely to include gvproxy.exe anyway for a future user-space network so this is a bit serendipitous!

docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
docs/tutorials/qemu-remote-tutorial.md Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@arixmkii
Copy link
Contributor Author

Updated tutorial, rebased to latest main and squashed commits.

Changes:

  • applied recommended changes in tutorial;
  • reworked and simplified Introduction section;
  • updated Makefile.

@n1hility kept the changes since latest version as a separate commit in a different branch arixmkii@f785459 for your convenience doing the review.

@arixmkii arixmkii force-pushed the gvproxy branch 3 times, most recently from 2682125 to 1bdcf4f Compare January 21, 2023 22:13
@n1hility n1hility self-requested a review January 23, 2023 22:38
Updated build scripts and installer build scripts to include gvproxy.exe.
Includes tutorial on setting up a Podman VM with QEMU and gvproxy on Windows.

Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
Copy link
Member

@n1hility n1hility left a comment

Choose a reason for hiding this comment

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

/approve LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 29, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arixmkii, n1hility

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2023
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2023
@openshift-merge-robot openshift-merge-robot merged commit df2e83b into containers:main Jan 30, 2023
@rhatdan
Copy link
Member

rhatdan commented Jan 30, 2023

/cherry-pick v4.4

@openshift-cherrypick-robot
Copy link
Collaborator

@rhatdan: new pull request created: #17275

In response to this:

/cherry-pick v4.4

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/test-infra repository.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 13, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 13, 2023
@arixmkii arixmkii deleted the gvproxy branch March 1, 2024 13:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants