mirror of
https://github.com/apple/container.git
synced 2026-09-05 15:26:02 +00:00
Noah Thornton
d4691e2830
This changes the semantics around `ReservedVmnetNetwork` and
`AllocationOnlyVmnetNetwork` to only create ipv4/6 subnets for networks
when the values are explicitly passed in the `NetworkConfiguration`.
Previously if the values in the `NetworkConfiguration` were not present
it would attempt to source them via `DefaultsStore`.
## Type of Change
- [X] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
The change solves an issue that caused `container network create <name>`
to fail when `UserDefaults` was set to a value that is identical to the
hard coded default ("192.168.64.1/24"/"fd00::/64"). It would fail
because a network with these parameters would already exist, and thus
could not be reserved.
## Testing
- [X] Tested locally
- [ ] Added/updated tests
- [ ] Added/updated docs
89 lines
3.0 KiB
Swift
89 lines
3.0 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import ContainerResource
|
|
import ContainerXPC
|
|
import ContainerizationError
|
|
import ContainerizationExtras
|
|
import Foundation
|
|
import Logging
|
|
|
|
public actor AllocationOnlyVmnetNetwork: Network {
|
|
// The IPv4 subnet to be used if none explicitly passed in the `NetworkConfiguration`
|
|
private static let defaultIPv4Subnet = try! CIDRv4("192.168.64.1/24")
|
|
|
|
private let log: Logger
|
|
private var _state: NetworkState
|
|
|
|
/// Configure a bridge network that allows external system access using
|
|
/// network address translation.
|
|
public init(
|
|
configuration: NetworkConfiguration,
|
|
log: Logger
|
|
) throws {
|
|
guard configuration.mode == .nat else {
|
|
throw ContainerizationError(.unsupported, message: "invalid network mode \(configuration.mode)")
|
|
}
|
|
|
|
guard configuration.ipv6Subnet == nil else {
|
|
throw ContainerizationError(.unsupported, message: "IPv6 subnet assignment is not yet implemented")
|
|
}
|
|
|
|
self.log = log
|
|
self._state = .created(configuration)
|
|
}
|
|
|
|
public var state: NetworkState {
|
|
self._state
|
|
}
|
|
|
|
public nonisolated func withAdditionalData(_ handler: (XPCMessage?) throws -> Void) throws {
|
|
try handler(nil)
|
|
}
|
|
|
|
public func start() async throws {
|
|
guard case .created(let configuration) = _state else {
|
|
throw ContainerizationError(.invalidState, message: "cannot start network \(_state.id) in \(_state.state) state")
|
|
}
|
|
|
|
log.info(
|
|
"starting allocation-only network",
|
|
metadata: [
|
|
"id": "\(configuration.id)",
|
|
"mode": "\(NetworkMode.nat.rawValue)",
|
|
]
|
|
)
|
|
|
|
let ipv4Subnet = configuration.ipv4Subnet ?? Self.defaultIPv4Subnet
|
|
|
|
let gateway = IPv4Address(ipv4Subnet.lower.value + 1)
|
|
let status = NetworkStatus(
|
|
ipv4Subnet: ipv4Subnet,
|
|
ipv4Gateway: gateway,
|
|
ipv6Subnet: nil,
|
|
)
|
|
self._state = .running(configuration, status)
|
|
log.info(
|
|
"started allocation-only network",
|
|
metadata: [
|
|
"id": "\(configuration.id)",
|
|
"mode": "\(configuration.mode)",
|
|
"cidr": "\(ipv4Subnet)",
|
|
]
|
|
)
|
|
}
|
|
}
|