-
Notifications
You must be signed in to change notification settings - Fork 304
ateapi: auto-inject the egress trust volume into every actor #1252
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
Max Thompson (thompsonmax)
wants to merge
1
commit into
agent-substrate:main
Choose a base branch
from
thompsonmax:egress-trust-injection
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.
Open
Changes from all commits
Commits
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 |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| # Binaries | ||
| /ateapi | ||
| /probe | ||
| /substratectl | ||
| /kubectl-ate | ||
| /atelet | ||
|
|
||
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,112 @@ | ||
| // 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 ( | ||
| "context" | ||
| "fmt" | ||
| "log/slog" | ||
| "strings" | ||
|
|
||
| "github.com/agent-substrate/substrate/internal/proto/ateletpb" | ||
| "github.com/agent-substrate/substrate/pkg/proto/ateapipb" | ||
| ) | ||
|
|
||
| // The auto-injected egress trust volume: under --inject-egress-trust-bundle | ||
| // every actor trusts the egress gateway's MITM CA with nothing declared in | ||
| // its template. | ||
| const ( | ||
| // The '.' makes template collisions impossible: template volume names | ||
| // must be DNS labels, and ate.dev names belong to the platform. | ||
| egressTrustVolumeName = "trust.ate.dev" | ||
|
|
||
| // Must stay on atelet's allowlist (cmd/atelet/trustbundle.go), which | ||
| // resolves it at every Run/Restore and fails actor start without it. | ||
| egressTrustBundleName = "egress-mitm.ate.dev" | ||
|
|
||
| egressTrustMountPath = "/run/substrate/certs" | ||
| egressTrustBundleFile = "egress-mitm.ate.dev.pem" | ||
| ) | ||
|
|
||
| // injectEgressTrustVolume mounts the egress trust volume into every container | ||
| // except those that own the path (ownsEgressTrustPath); if all opt out, no | ||
| // volume is injected, so the actor is not gated on a bundle nothing reads. | ||
| func injectEgressTrustVolume(ctx context.Context, actor *ateapipb.Actor, spec *ateletpb.WorkloadSpec) error { | ||
| for _, vol := range spec.GetVolumes() { | ||
| if vol.GetName() == egressTrustVolumeName { | ||
| return fmt.Errorf("volume name %q is reserved for the injected egress trust bundle", egressTrustVolumeName) | ||
| } | ||
| } | ||
| mounted := false | ||
| for _, ctr := range spec.GetContainers() { | ||
| if path, ok := ownsEgressTrustPath(spec, ctr); ok { | ||
| slog.InfoContext(ctx, "Not mounting the egress trust volume: the template owns the path", | ||
| slog.String("atespace", actor.GetMetadata().GetAtespace()), | ||
| slog.String("actor", actor.GetMetadata().GetName()), | ||
| slog.String("container", ctr.GetName()), | ||
| slog.String("mountPath", path)) | ||
| continue | ||
| } | ||
| ctr.VolumeMounts = append(ctr.VolumeMounts, &ateletpb.VolumeMount{ | ||
| Name: egressTrustVolumeName, | ||
| MountPath: egressTrustMountPath, | ||
| }) | ||
| mounted = true | ||
| } | ||
| if !mounted { | ||
| return nil | ||
| } | ||
| spec.Volumes = append(spec.Volumes, &ateletpb.Volume{ | ||
| Name: egressTrustVolumeName, | ||
| Source: &ateletpb.Volume_SystemInfo{ | ||
| SystemInfo: &ateletpb.SystemInfoVolume{ | ||
| DataSources: []*ateletpb.SystemInfoDataSource{{ | ||
| DataSource: &ateletpb.SystemInfoDataSource_TrustBundle{ | ||
| TrustBundle: &ateletpb.TrustBundleDataSource{ | ||
| Name: egressTrustBundleName, | ||
| Path: egressTrustBundleFile, | ||
| }, | ||
| }, | ||
| }}, | ||
| }, | ||
| }, | ||
| }) | ||
| return nil | ||
| } | ||
|
|
||
| // ownsEgressTrustPath returns the template mount that opts ctr out: at or | ||
| // below the reserved path, or an image volume above it — micro-VM bind | ||
| // ordering would shadow one mount with the other either way. | ||
| func ownsEgressTrustPath(spec *ateletpb.WorkloadSpec, ctr *ateletpb.Container) (string, bool) { | ||
| for _, m := range ctr.GetVolumeMounts() { | ||
| mp := m.GetMountPath() | ||
| if mp == egressTrustMountPath || strings.HasPrefix(mp, egressTrustMountPath+"/") { | ||
| return mp, true | ||
| } | ||
| if strings.HasPrefix(egressTrustMountPath, mp+"/") && isImageVolume(spec, m.GetName()) { | ||
| return mp, true | ||
| } | ||
| } | ||
| return "", false | ||
| } | ||
|
|
||
| func isImageVolume(spec *ateletpb.WorkloadSpec, name string) bool { | ||
| for _, vol := range spec.GetVolumes() { | ||
| if vol.GetName() == name { | ||
| return vol.GetImage() != nil | ||
| } | ||
| } | ||
| return false | ||
| } |
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.
Max Thompson (@thompsonmax) , what is the impact of this change on
e2e-testpresubmit? How much longer does it make?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.
Quick timing check:
Both runs are from today. Main is commit 9b333c6, run 33915867922 at 20:22 UTC. The PR is 6ae844e, run 33923715673 at 22:01 UTC.
So, this adds about 2 minutes at the step level.