Skip to content

[container-run-create]: add support for --network none #739

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
jglogan merged 4 commits into from
Oct 21, 2025
Merged

[container-run-create]: add support for --network none #739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab78d7a
[container-run-create]: add support for --network none
saehejkang Oct 8, 2025
71ea5a6
resolve PR comments
saehejkang Oct 17, 2025
cce652f
Merge branch 'main' into container-create-run-no-network-attached
saehejkang Oct 17, 2025
f341413
Merge branch 'main' into container-create-run-no-network-attached
saehejkang Oct 21, 2025
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
1 change: 1 addition & 0 deletions Sources/ContainerClient/Core/ClientNetwork.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public struct ClientNetwork {
static let serviceIdentifier = "com.apple.container.apiserver"

public static let defaultNetworkName = "default"
public static let noNetworkName = "none"
}

extension ClientNetwork {
Expand Down
17 changes: 12 additions & 5 deletions Sources/ContainerClient/Utility.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,18 @@ public struct Utility {

config.virtualization = management.virtualization

config.networks = try getAttachmentConfigurations(containerId: config.id, networkIds: management.networks)
for attachmentConfiguration in config.networks {
let network: NetworkState = try await ClientNetwork.get(id: attachmentConfiguration.network)
guard case .running(_, _) = network else {
throw ContainerizationError(.invalidState, message: "network \(attachmentConfiguration.network) is not running")
if management.networks.contains(ClientNetwork.noNetworkName) {
if management.networks.count != 1 {
throw ContainerizationError(.unsupported, message: "no other networks may be created along with network \(ClientNetwork.noNetworkName)")
}
config.networks = []
} else {
config.networks = try getAttachmentConfigurations(containerId: config.id, networkIds: management.networks)
for attachmentConfiguration in config.networks {
let network: NetworkState = try await ClientNetwork.get(id: attachmentConfiguration.network)
guard case .running(_, _) = network else {
throw ContainerizationError(.invalidState, message: "network \(attachmentConfiguration.network) is not running")
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions Sources/Services/ContainerAPIService/Networks/NetworksService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ public actor NetworksService {
"id": "\(configuration.id)"
])

//Ensure that the network is not named "none"
if configuration.id == ClientNetwork.noNetworkName {
throw ContainerizationError(.unsupported, message: "network \(configuration.id) is not a valid name")
}

// Ensure nobody is manipulating the network already.
guard !busyNetworks.contains(configuration.id) else {
throw ContainerizationError(.exists, message: "network \(configuration.id) has a pending operation")
Expand Down