Skip to content

incusd/network/bridge: Fix deletion of tunnels and dummy devices #1698

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

Merged
merged 1 commit into from
Feb 28, 2025

Conversation

montag451
Copy link
Contributor

In a previous PR (#1627) I forgot to update one path in the code.

@montag451 montag451 requested a review from stgraber as a code owner February 25, 2025 22:36
@stgraber
Copy link
Member

So the tests failing bring up a good point.

If the user passes a gretap, vxlan or dummy device through bridge.external_interfaces, we definitely don't want to delete those.

It would probably be a good idea to go over the interfaces in bridge.external_interfaces and remove those from the bridge before nuking everything else.

@montag451 montag451 marked this pull request as draft February 26, 2025 07:30
@montag451 montag451 force-pushed the fix-bridge-deletion branch 2 times, most recently from 77e83f1 to 4a3bd2f Compare February 28, 2025 14:16
@montag451 montag451 marked this pull request as ready for review February 28, 2025 14:19
The previous code relied purely on the name of the device to decide if
a device should be deleted which was not correct and could result in
the deletion of unwanted devices. The new code ensures that the device
is part of the bridge and that its kind is correct before deleting it.

Signed-off-by: montag451 <[email protected]>
@stgraber stgraber merged commit abb732c into lxc:main Feb 28, 2025
36 checks passed
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Mar 3, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [lxc/incus](https://github.com/lxc/incus) | patch | `v6.10.0` -> `v6.10.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>lxc/incus (lxc/incus)</summary>

### [`v6.10.1`](https://github.com/lxc/incus/releases/tag/v6.10.1)

[Compare Source](lxc/incus@v6.10.0...v6.10.1)

### Announcement

This is a small bugfix release on top of the main Incus 6.10 release.

For Incus 6.10, please see:
https://discuss.linuxcontainers.org/t/incus-6-10-has-been-released/23077

#### What's Changed

-   incusd/network/bridge: Fix deletion of tunnels and dummy devices by [@&#8203;montag451](https://github.com/montag451) in lxc/incus#1698
-   Translations update from Hosted Weblate by [@&#8203;weblate](https://github.com/weblate) in lxc/incus#1710
-   Provide the RBD keeyring to QEMU by [@&#8203;stgraber](https://github.com/stgraber) in lxc/incus#1709
-   incusd/storage/ceph: Re-introduce keyring parsing by [@&#8203;stgraber](https://github.com/stgraber) in lxc/incus#1716
-   Move IOMMU handling under configuration option by [@&#8203;stgraber](https://github.com/stgraber) in lxc/incus#1715

**Full Changelog**: lxc/incus@v6.10.0...v6.10.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xODIuNCIsInVwZGF0ZWRJblZlciI6IjM5LjE4Mi40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants