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

gvproxy: Update to 0.7.2 release #21278

Merged

Conversation

cfergeau
Copy link
Contributor

This updates the Windows installer and macOS installer to ship the newer
binaries, as well as the vendored gvisor-tap-vsock code.

[NO NEW TESTS NEEDED]

Does this PR introduce a user-facing change?

None

(unless you track version updates of the modules you are using, in which case this would become "Update gvisor-tap-vsock binaries to 0.7.2 - this fixes a startup race condition when using applehv")

This updates the Windows installer and macOS installer to ship the newer
binaries, as well as the vendored gvisor-tap-vsock code.

[NO NEW TESTS NEEDED]

Signed-off-by: Christophe Fergeau <[email protected]>
Copy link
Member

@gbraad gbraad left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented Jan 17, 2024

@gbraad: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@gbraad
Copy link
Member

gbraad commented Jan 17, 2024

This release solves several issues related to AppleHV (vfkit)

@baude
Copy link
Member

baude commented Jan 17, 2024

/approve
/hold
/lgtm

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 17, 2024
Copy link
Contributor

openshift-ci bot commented Jan 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude, cfergeau, gbraad

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 17, 2024
@baude
Copy link
Member

baude commented Jan 17, 2024

/cherry-pick v4.9

@openshift-cherrypick-robot
Copy link
Collaborator

@baude: once the present PR merges, I will cherry-pick it on top of v4.9 in a new PR and assign it to you.

In response to this:

/cherry-pick v4.9

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.

@baude
Copy link
Member

baude commented Jan 17, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2024
@mheon
Copy link
Member

mheon commented Jan 17, 2024

/hold cancel
LGTM

@openshift-merge-bot openshift-merge-bot bot merged commit 1c81798 into containers:main Jan 17, 2024
91 of 93 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@baude: #21278 failed to apply on top of branch "v4.9":

Applying: gvproxy: Update to 0.7.2 release
Using index info to reconstruct a base tree...
M	Makefile
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go
Removing vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gvproxy: Update to 0.7.2 release
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick v4.9

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.

@baude
Copy link
Member

baude commented Jan 17, 2024

@mheon auto cherrypick failed here.

@cfergeau
Copy link
Contributor Author

@mheon auto cherrypick failed here.

I don't know in which branch/PR/... the cherry-pick happens, but I've rebased https://github.com/cfergeau/podman/commits/gvisor-tap-vsock-update/ on top of the v4.9 branch and resolved the conflict (roughly git checkout HEAD -- go.mod && go get github.com/containers/[email protected] && go mod tidy && go mod vendor)

@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 Apr 18, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 18, 2024
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. podman 4.9 release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants