Skip to content

Use quadlet and start gvisor-tap-vsock before nodeip-configuration service #1054

Merged
openshift-merge-bot[bot] merged 2 commits intocrc-org:release-4.18from
praveenkumar:use_quadlet
May 2, 2025
Merged

Use quadlet and start gvisor-tap-vsock before nodeip-configuration service #1054
openshift-merge-bot[bot] merged 2 commits intocrc-org:release-4.18from
praveenkumar:use_quadlet

Conversation

@praveenkumar
Copy link
Copy Markdown
Member

@praveenkumar praveenkumar commented Apr 30, 2025 •
edited by sourcery-ai bot
Loading

Summary by Sourcery

Migrate gvisor-tap-vsock service configuration from traditional systemd service to quadlet container configuration

Enhancements:

  • Modify service startup to use quadlet container configuration
  • Add explicit service ordering with nodeip-configuration service

Chores:

  • Update gvisor-tap-vsock service deployment method

@praveenkumar
Use quadlet instead of podman generate systemd command
d101034 
podman generate systemd command is deprecated and recommend to use
quadlet.
```
DEPRECATED command:
It is recommended to use Quadlets for running containers and pods under systemd.
```
@praveenkumar
Start gvisor-tap-vsock before nodeip-configuration service
8bc17ed 
Recently with latest version of 4.18.10, noticed nodeip-configuration
unit starts before gvisor-tap-vsock and blocks it. This cause problem
to get IP address of VM.
@openshift-ci openshift-ci bot requested review from anjannath and gbraad April 30, 2025 10:29
@sourcery-ai
Copy link
Copy Markdown

sourcery-ai bot commented Apr 30, 2025 •
edited
Loading

Reviewer's Guide

This pull request updates the createdisk.sh script to configure and manage the gvisor-tap-vsock service using a quadlet (.container) file instead of direct podman create and podman generate systemd commands. It also ensures this service starts before the nodeip-configuration service.

File-Level Changes

Change Details Files
Replaced manual podman commands with a quadlet definition for gvisor-tap-vsock.
  • Removed podman create and podman generate systemd commands.
  • Added podman pull for the image.
  • Created /etc/containers/systemd/gvisor-tap-vsock.container using a heredoc to define the container and systemd unit properties.
  • Removed manual systemd daemon-reload and service enabling commands for the old method.
 createdisk.sh
Ensured gvisor-tap-vsock starts before nodeip-configuration.
  • Added Before=nodeip-configuration.service directive within the [Unit] section of the quadlet file.
 createdisk.sh
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

sourcery-ai[bot]
sourcery-ai bot reviewed Apr 30, 2025
View reviewed changes
Copy link
Copy Markdown

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @praveenkumar - I've reviewed your changes - here's some feedback:

  • Consider simplifying the nested heredoc structure for the quadlet file creation to improve readability.
  • Prefer using specific quadlet keys (e.g., Privileged, Volume, Interactive, TTY) instead of bundling options within PodmanArgs for better clarity.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Documentation: all looks good
Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@praveenkumar
Copy link
Copy Markdown
Member Author

praveenkumar commented Apr 30, 2025

/test e2e-microshift

@anjannath
Copy link
Copy Markdown
Member

anjannath commented May 2, 2025

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label May 2, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented May 2, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anjannath

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 label May 2, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 1ac852f into crc-org:release-4.18 May 2, 2025
4 checks passed
@anjannath
Copy link
Copy Markdown
Member

anjannath commented May 2, 2025

/cherry-pick master

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 2, 2025

@anjannath: new pull request created: #1055

Details

In response to this:

/cherry-pick master

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 2, 2025
Merged
@praveenkumar
Copy link
Copy Markdown
Member Author

praveenkumar commented May 2, 2025

/cherry-pick release-4.19

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 2, 2025

@praveenkumar: new pull request created: #1056

Details

In response to this:

/cherry-pick release-4.19

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 2, 2025
Merged
@cfergeau cfergeau mentioned this pull request May 5, 2025
Merged
cfergeau
cfergeau reviewed May 5, 2025
View reviewed changes
createdisk.sh
[Container]
Image=quay.io/crcont/gvisor-tap-vsock:latest
Network=host
PodmanArgs=--interactive --privileged --tty
Copy link
Copy Markdown
Contributor

@cfergeau cfergeau May 5, 2025

Choose a reason for hiding this comment

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

--tty --interactive? is this required?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfergeau cfergeau cfergeau left review comments

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments

@anjannath anjannath Awaiting requested review from anjannath

@gbraad gbraad Awaiting requested review from gbraad

Assignees

@anjannath anjannath

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@praveenkumar @anjannath @openshift-cherrypick-robot @cfergeau