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

Force use of iptables on Windows WSL #25202

Merged

Conversation

l0rd
Copy link
Member

@l0rd l0rd commented Feb 3, 2025

This is a workaround for #25201 and helps with
upgrading the WSL image to Fedora 41.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 3, 2025
@@ -12,6 +12,9 @@ const containersConf = `[containers]
[engine]
cgroup_manager = "cgroupfs"
[network]
firewall_driver="iptables"
Copy link
Member

Choose a reason for hiding this comment

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

please add the issue link as comment here so we know why this is set right away.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you. I have fixed it.

This is a workaround for containers#25201 and helps with
upgrading the WSL image to Fedora 41.

Signed-off-by: Mario Loriedo <[email protected]>
@l0rd l0rd force-pushed the wsl-hardcode-network-config branch from ee931c8 to dae1541 Compare February 3, 2025 13:40
@Luap99 Luap99 added the v5.4 label Feb 3, 2025
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM, we should pick this into 5.4 so we can update the fedora base image for it.

@l0rd l0rd added the No New Tests Allow PR to proceed without adding regression tests label Feb 3, 2025
@l0rd
Copy link
Member Author

l0rd commented Feb 3, 2025

Setting label No New Tests considered that it should be temporary and already covered by the e2e machine tests (i.e. podman run fails on WSL otherwise).

Copy link
Member

@jakecorrenti jakecorrenti 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 Feb 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jakecorrenti, l0rd, 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

@mheon
Copy link
Member

mheon commented Feb 3, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit c81625f into containers:main Feb 3, 2025
86 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. machine No New Tests Allow PR to proceed without adding regression tests release-note-none v5.4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants