-
Notifications
You must be signed in to change notification settings - Fork 337
per sandbox networking #1689
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
Open
Benjamin Elder (BenTheElder)
wants to merge
4
commits into
agent-substrate:main
Choose a base branch
from
BenTheElder:per-sandbox-networking
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,301
−1,259
Open
per sandbox networking #1689
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0a58087
ateomnet: isolate sandbox networking by namespace
BenTheElder 7e2f7f0
atunnel: relay sandbox DNS through pod resolvers
BenTheElder e60919f
readyz, ocispec: support sandbox-specific networking
BenTheElder fc3897e
ateom: use per-sandbox network namespaces
BenTheElder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| //go:build linux | ||
|
|
||
| // Copyright 2026 Google LLC | ||
| // | ||
| // 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 | ||
| // | ||
| // http://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. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "io/fs" | ||
| "log/slog" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/agent-substrate/substrate/internal/ateomnet" | ||
| "github.com/agent-substrate/substrate/internal/ateompath" | ||
| "github.com/agent-substrate/substrate/internal/atunnel" | ||
| ) | ||
|
|
||
| // prepareSandboxNetwork builds the actor's network and starts serving it. | ||
| func (s *AteomService) prepareSandboxNetwork(ctx context.Context, actorUID string) error { | ||
| if err := s.releaseSandboxNetwork(ctx); err != nil { | ||
| return err | ||
| } | ||
| session, err := ateomnet.ServeSandbox(ctx, ateomnet.SandboxNetworkConfig{ | ||
| ActorUID: actorUID, | ||
| Veth: true, | ||
| EgressPort: s.atunnelEgressPort, | ||
| DNSPort: atunnel.DNSPort, | ||
| }, s.atunnelEgress, s.dnsRelay) | ||
| if err != nil { | ||
| return fmt.Errorf("while setting up the sandbox network: %w", err) | ||
| } | ||
|
|
||
| // Point the sandbox resolver at its gateway. | ||
| if _, err := actorResolvConf(actorUID); err != nil { | ||
| _ = session.Close(ctx) | ||
| return err | ||
| } | ||
|
|
||
| return s.sandbox.Replace(ctx, session) | ||
| } | ||
|
|
||
| // releaseSandboxNetwork stops serving the actor and takes its network down, | ||
| // along with the resolv.conf atelet's per-activation reset leaves behind. | ||
| func (s *AteomService) releaseSandboxNetwork(ctx context.Context) error { | ||
|
BenTheElder marked this conversation as resolved.
|
||
| if session := s.sandbox.Session(); session != nil { | ||
| if err := os.Remove(ateompath.ActorResolvConfPath(session.Network.ActorUID)); err != nil && !errors.Is(err, fs.ErrNotExist) { | ||
| slog.WarnContext(ctx, "Failed to remove the actor resolv.conf", slog.Any("err", err)) | ||
| } | ||
| } | ||
| return s.sandbox.Close(ctx) | ||
| } | ||
|
|
||
| // actorResolvConf writes the resolver bind source outside the actor's rootfs. | ||
| func actorResolvConf(actorUID string) (string, error) { | ||
| pod, err := os.ReadFile("/etc/resolv.conf") | ||
| if err != nil { | ||
| return "", fmt.Errorf("reading the worker pod resolv.conf: %w", err) | ||
| } | ||
| path := ateompath.ActorResolvConfPath(actorUID) | ||
| if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil { | ||
| return "", fmt.Errorf("creating the actor directory: %w", err) | ||
| } | ||
| if err := os.WriteFile(path, ateomnet.SandboxResolvConf(pod), 0o644); err != nil { | ||
| return "", fmt.Errorf("writing the actor resolv.conf: %w", err) | ||
| } | ||
| return path, nil | ||
| } | ||
|
|
||
| // attachAtunnel completes setup after atunnel receives the service's dialer. | ||
| func (s *AteomService) attachAtunnel(ingress *atunnel.Server, egress *atunnel.Egress, egressPort uint16) { | ||
| s.atunnelIngress = ingress | ||
| s.atunnelEgress = egress | ||
| s.atunnelEgressPort = egressPort | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Preserve the documented behavior when no egress gateway is configured.
gVisor setup and microVM setup now always redirect TCP into atunnel, but
prepareActorEgressstill returns nil for an absent gateway andactivateActorNetworkingthen skips activating egress. The inactive handler closes every intercepted connection. The API server still defaults the gateway address to empty, and the protocol contract explicitly promises direct egress in that case.Could we preserve this supported mode, or explicitly require a gateway and update the configuration contract? At present an actor can start successfully with all external TCP connectivity broken. This was traced through both runtimes; I did not run a complete boot without a gateway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After some side discussions: I think we want to change this to clearly state that egress is not supported without a gateway, but a gateway is not strictly required (perhaps your actor does not need egress).
If we really need it later we can add a no-capture mode, but it greatly simplifies things to always use atunnel, and atunnel will need an egress gateway for egress.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
plus 1 to ben