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

Superseed #130 and #129 #132

Merged
merged 4 commits into from
Jul 14, 2022
Merged

Superseed #130 and #129 #132

merged 4 commits into from
Jul 14, 2022

Conversation

praveenkumar
Copy link
Contributor

This superseded #130 with #130 (comment)

cfergeau and others added 4 commits July 13, 2022 15:32
This will be useful on the new M1 machines to avoid the use of rosetta.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
This makes use of github.com/randall77/makefat in order to generate a
gvproxy-darwin binary containing both the amd64 and arm64 binaries.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Tests are currently failing because of an unexpected 'src 192.168.127.2'
appearance in 'ip route show' output. It's likely unrelated to
gvisor-tap-vsock and caused by a change in the underlying OS.
This commit ignores this extra output if it's present, which fixes the
tests.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Adding the `-cpu host` option to the `qemuArgs` function for
darwin removes the warning message, "host doesn't support requested
feature: CPUID.80000001H:ECX.svm [bit 2]"

Signed-off-by: Praveen Kumar <kumarpraveen.nitdgp@gmail.com>
@praveenkumar praveenkumar changed the title Superseed #130 Superseed #130 and #129 Jul 14, 2022
@gbraad
Copy link
Member

gbraad commented Jul 14, 2022

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: gbraad, praveenkumar

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

@gbraad gbraad merged commit ed3b72e into containers:main Jul 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants