Show gateway leases when features.networks is disabled (for default project networks)
#14305
+71
−34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Documentation
hamistao
force-pushed
the
consistent-list-allocations
branch
from
a2f8bac
to
6db63a7
Compare
github-actions
bot
removed
Documentation
tomponline
reviewed
Oct 21, 2024
lxd/network/driver_ovn.go
Outdated
|
|
||
| // Only query for project when we need to check for "features.networks". That is, when the network project is | ||
| // the default project and projectName refers to any one other project. | ||
| if projectName != api.ProjectDefaultName && projectName != "" && n.project == api.ProjectDefaultName { |
There was a problem hiding this comment.
Can we move this logic into NetworkProject() to avoid the duplication? Would that be correct?
There was a problem hiding this comment.
I don't think this would be correct since we have to consider the networks from project default and the instances from the requested project (e.g. projectName)
There was a problem hiding this comment.
Lets move this to an exported function in network.Common
tomponline
reviewed
Oct 21, 2024
lxd/network/driver_ovn.go
Outdated
|
|
||
| // Include gateway IPs when the network belongs to requested project, getting leases for all projects or | ||
| // requested project doesn't have features.networks and network is in default project. | ||
| if projectName == n.project || projectName == "" || |
There was a problem hiding this comment.
please dont put if statements on multiple lines.
If its too long please break it up into multiple variables to make the if statement clearer.
hamistao
force-pushed
the
consistent-list-allocations
branch
from
6db63a7
to
12a306e
Compare
Signed-off-by: hamistao <[email protected]>
Signed-off-by: hamistao <[email protected]>
Signed-off-by: hamistao <[email protected]>
Signed-off-by: hamistao <[email protected]>
hamistao
force-pushed
the
consistent-list-allocations
branch
from
12a306e
to
9efb65f
Compare
Signed-off-by: hamistao <[email protected]>
We do want gateway Leases to show when listing them for a project if the network is visible from that project. However, when dealing with DNS zone configuration, we only want to consider these leases when dealing with the network's original project. Signed-off-by: hamistao <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If project
foohasfeatures.networksdisabled on a project, it does not have networks of its own and the networks from the default project are visible from that project. However, the gateway leases for networks on the default project don't show onlxc network list-leases lxdbr0 --project foo.This PR proposes changing this behavior and showing those leases, being more consistent with how we handle
features.networks.