-
Notifications
You must be signed in to change notification settings - Fork 105
Decouple Sandbox Binaries / Config from ActorTemplate #261
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
Merged
Benjamin Elder (BenTheElder)
merged 6 commits into
agent-substrate:main
from
BenTheElder:sandbox-bins
Jun 17, 2026
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fde712e
feat(api): add SandboxConfig CRD; move sandbox binaries off ActorTemp…
BenTheElder 536ae8f
feat(ateletpb): replace RunscConfig with generic SandboxAssets
BenTheElder 8d1b7ea
feat(atelet): fetch sandbox assets generically + snapshot manifest
BenTheElder 4247c11
feat(ateapi): resolve sandbox binaries from WorkerPool SandboxConfig
BenTheElder 42b0202
feat(install): default gVisor SandboxConfig; drop runsc from demos
BenTheElder ca581e1
feat(api): validate SandboxConfig assets via VAP
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // 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 controlapi | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/agent-substrate/substrate/internal/proto/ateletpb" | ||
| atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" | ||
| listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| ) | ||
|
|
||
| // resolveSandboxAssets determines the sandbox binaries an actor should boot with | ||
| // and projects them onto the ateletpb.SandboxAssets atelet fetches. It resolves | ||
| // the actor's WorkerPool, takes its SandboxClass (default gvisor), then picks the | ||
| // SandboxConfig named by the pool — or, if none is named, the cluster default | ||
| // SandboxConfig for that class. | ||
| func resolveSandboxAssets( | ||
| workerPoolLister listersv1alpha1.WorkerPoolLister, | ||
| sandboxConfigLister listersv1alpha1.SandboxConfigLister, | ||
| at *atev1alpha1.ActorTemplate, | ||
| ) (*ateletpb.SandboxAssets, error) { | ||
| ref := at.Spec.WorkerPoolRef | ||
| wp, err := workerPoolLister.WorkerPools(ref.Namespace).Get(ref.Name) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("while getting WorkerPool %s/%s: %w", ref.Namespace, ref.Name, err) | ||
| } | ||
|
|
||
| class := wp.Spec.SandboxClass | ||
| if class == "" { | ||
| class = atev1alpha1.SandboxClassGvisor | ||
| } | ||
|
|
||
| var sc *atev1alpha1.SandboxConfig | ||
| if name := wp.Spec.SandboxConfigName; name != "" { | ||
|
BenTheElder marked this conversation as resolved.
|
||
| sc, err = sandboxConfigLister.Get(name) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("while getting SandboxConfig %q: %w", name, err) | ||
| } | ||
| if sc.Spec.SandboxClass != class { | ||
| return nil, fmt.Errorf("SandboxConfig %q has class %q but WorkerPool %s/%s is class %q", | ||
| name, sc.Spec.SandboxClass, ref.Namespace, ref.Name, class) | ||
| } | ||
| } else { | ||
| sc, err = defaultSandboxConfig(sandboxConfigLister, class) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
|
|
||
| return sandboxAssetsProto(class, sc), nil | ||
| } | ||
|
|
||
| // defaultSandboxConfig returns the single SandboxConfig marked Default for the | ||
| // given class, erroring if there are zero or more than one. | ||
| func defaultSandboxConfig(lister listersv1alpha1.SandboxConfigLister, class atev1alpha1.SandboxClass) (*atev1alpha1.SandboxConfig, error) { | ||
| all, err := lister.List(labels.Everything()) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("while listing SandboxConfigs: %w", err) | ||
| } | ||
| var match *atev1alpha1.SandboxConfig | ||
| for _, sc := range all { | ||
| if sc.Spec.SandboxClass == class && sc.Spec.Default { | ||
| if match != nil { | ||
| return nil, fmt.Errorf("multiple default SandboxConfigs for class %q (%q and %q)", class, match.Name, sc.Name) | ||
| } | ||
| match = sc | ||
| } | ||
| } | ||
| if match == nil { | ||
| return nil, fmt.Errorf("no default SandboxConfig for class %q; set one with spec.default=true or name one via WorkerPool.spec.sandboxConfigName", class) | ||
| } | ||
| return match, nil | ||
| } | ||
|
|
||
| // sandboxAssetsProto converts a resolved SandboxConfig into the proto atelet | ||
| // consumes. | ||
| func sandboxAssetsProto(class atev1alpha1.SandboxClass, sc *atev1alpha1.SandboxConfig) *ateletpb.SandboxAssets { | ||
| out := &ateletpb.SandboxAssets{ | ||
| SandboxClass: string(class), | ||
| Assets: make(map[string]*ateletpb.ArchAssets, len(sc.Spec.Assets)), | ||
| } | ||
| for arch, files := range sc.Spec.Assets { | ||
| archAssets := &ateletpb.ArchAssets{Files: make(map[string]*ateletpb.AssetFile, len(files))} | ||
| for name, f := range files { | ||
| archAssets.Files[name] = &ateletpb.AssetFile{Url: f.URL, Sha256: f.SHA256} | ||
| } | ||
| out.Assets[arch] = archAssets | ||
| } | ||
| return out | ||
| } | ||
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
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.
when do these get pruned? (from the gcs bucket)
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.
No idea, but this value isn't new to the PR. This is what we ship in clusters. We can update both when a release has the fixes we need.