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

rpm: gvforwarder subpackage #268

Merged
merged 1 commit into from
Sep 13, 2023

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Sep 12, 2023

This commit places the gvforwarder binary in a new gvforwarder subpackage. This subpackage will be a hard dependency for podman as its required in FCOS. This subpackage will also be a hard dependency for the main package to preserve upgrade path.

This commit places the gvforwarder binary in a new gvforwarder
subpackage. This subpackage will be a hard dependency for podman as its
required in FCOS. This subpackage will also be a hard dependency for the
main package to preserve upgrade path.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
@lsm5
Copy link
Member Author

lsm5 commented Sep 12, 2023

@baude we'll need to have gvisor-tap-vsock have a hard dependency on gvforwarder to preserve the files installed as we're moving the gvforwarder out of the main package. Will not affect fcos as the main package won't get pulled in.

@lsm5 lsm5 marked this pull request as ready for review September 12, 2023 19:01
lsm5 added a commit to lsm5/podman that referenced this pull request Sep 12, 2023
With containers/gvisor-tap-vsock#268,
gvforwarder is now provided via the subpackage
`gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the
hard dependency.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
lsm5 added a commit to lsm5/podman that referenced this pull request Sep 12, 2023
With containers/gvisor-tap-vsock#268,
gvforwarder is now provided via the subpackage
`gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the
hard dependency.

gvisor-tap-vsock is a separate package for f38, so the subpackage
conditional has been adjusted to fit that.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
@lsm5
Copy link
Member Author

lsm5 commented Sep 12, 2023

@baude I'll build gvisor and podman (containers/podman#19953) with these changes on Fedora, so you can use them on fcos asap. We should get these PRs in as well before the next release for packit to not blow things up.

lsm5 added a commit to lsm5/podman that referenced this pull request Sep 12, 2023
With containers/gvisor-tap-vsock#268,
gvforwarder is now provided via the subpackage
`gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the
hard dependency.

gvisor-tap-vsock is a separate package for f38, so the subpackage
conditional has been adjusted to fit that.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
@baude
Copy link
Member

baude commented Sep 12, 2023

/approve
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude, lsm5, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit f93fe26 into containers:main Sep 13, 2023
16 checks passed
lsm5 added a commit to lsm5/gvisor-tap-vsock that referenced this pull request Sep 13, 2023
The prior change in containers#268 didn't completely obsolete older builds of
gvisor-tap-vsock, causing installation conflicts with the official
Fedora builds. This commit should correctly obsolete fedora packages.

Ref: https://cirrus-ci.com/task/5730166412935168

Note: To avoid nvr complexity, this commit only fixes the conflicts for
official Fedora builds. Any issues with the podman-next copr can be
fixed on a case-by-case basis unless an overwhelming amount of people
complain.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
lsm5 added a commit to lsm5/podman that referenced this pull request Sep 13, 2023
With containers/gvisor-tap-vsock#268,
gvforwarder is now provided via the subpackage
`gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the
hard dependency.

This change is only intended for f38 and higher.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
lsm5 added a commit to lsm5/podman that referenced this pull request Sep 13, 2023
With containers/gvisor-tap-vsock#268,
gvforwarder is now provided via the subpackage
`gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the
hard dependency.

This change is only intended for f38 and higher.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
lsm5 added a commit to lsm5/podman that referenced this pull request Sep 13, 2023
With containers/gvisor-tap-vsock#268,
gvforwarder is now provided via the subpackage
`gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the
hard dependency.

This change is only intended for f38 and higher.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
@lsm5 lsm5 deleted the gvforwarder-subpackage branch September 14, 2023 13:04
lsm5 added a commit to lsm5/gvisor-tap-vsock that referenced this pull request Sep 14, 2023
The prior change in containers#268 didn't completely obsolete older builds of
gvisor-tap-vsock, causing installation conflicts with the official
Fedora builds. This commit should correctly obsolete fedora packages.

Ref: https://cirrus-ci.com/task/5730166412935168

This change should also address installation conflicts in
cockpit-reverse dependency tests on podman upstream

Ref: https://artifacts.dev.testing-farm.io/716a3cac-ab80-4eb8-921c-da3a784b94fb/

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
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.

4 participants