Skip to content

Use configuration subnet and fallback to default subnet in allocation only plugin #1057

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.

Sign up for GitHub

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
katiewasnothere merged 1 commit into from
Jan 20, 2026
Merged

Use configuration subnet and fallback to default subnet in allocation only plugin #1057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Sources/Services/ContainerNetworkService/Server/AllocationOnlyVmnetNetwork.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ public actor AllocationOnlyVmnetNetwork: Network {
]
)

let subnet = DefaultsStore.get(key: .defaultSubnet)
let subnetCIDR = try CIDRv4(subnet)
let gateway = IPv4Address(subnetCIDR.lower.value + 1)
let defaultIPv4Subnet = try CIDRv4(DefaultsStore.get(key: .defaultSubnet))
let ipv4Subnet = configuration.ipv4Subnet ?? defaultIPv4Subnet
let gateway = IPv4Address(ipv4Subnet.lower.value + 1)
let status = NetworkStatus(
ipv4Subnet: subnetCIDR,
ipv4Subnet: ipv4Subnet,
ipv4Gateway: gateway,
ipv6Subnet: nil,
)
Expand All @@ -79,7 +79,7 @@ public actor AllocationOnlyVmnetNetwork: Network {
metadata: [
"id": "\(configuration.id)",
"mode": "\(configuration.mode)",
"cidr": "\(subnet)",
"cidr": "\(ipv4Subnet)",
]
)
}
Expand Down