Skip to content

Remove union discriminator field from ActorTemplate.volumes. #1398

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
shrutiyam-glitch merged 1 commit into from
Sep 2, 2026
Merged

Remove union discriminator field from ActorTemplate.volumes. #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
280 changes: 140 additions & 140 deletions benchmarking/locust/common/ateapi_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion benchmarking/workloads/manifests/glutton-durdir-data-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ containers:
mountPath: /var/lib/glutton
volumes:
- name: data
type: DurableDir
durableDir: {}
snapshotsConfig:
onPause: SNAPSHOT_CONTENT_SCOPE_FULL
Expand Down
1 change: 0 additions & 1 deletion benchmarking/workloads/manifests/glutton-durdir-full-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ containers:
mountPath: /var/lib/glutton
volumes:
- name: data
type: DurableDir
durableDir: {}
snapshotsConfig:
onPause: SNAPSHOT_CONTENT_SCOPE_FULL
Expand Down
1 change: 0 additions & 1 deletion cmd/ate-setup/internal/demos/counter/counter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func externalVolumeValues(e *steps.Env) map[string]string {
"EXTERNAL_VOLUME_MOUNTS": " - name: external-data\n" +
" mountPath: /external-data",
"EXTERNAL_VOLUMES": "- name: external-data\n" +
" type: ExternalVolumeTemplate\n" +
" externalVolumeTemplate:\n" +
" capacity: 1Gi\n" +
" storageClassName: " + storageClass,
Expand Down
7 changes: 0 additions & 7 deletions cmd/ateapi/internal/controlapi/functionaltest/actor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ func TestCreateActor_WithExternalVolumes(t *testing.T) {
volumes := []*ateapipb.Volume{
{
Name: "ext-vol-1",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
Capacity: "10Gi",
Expand Down Expand Up @@ -327,7 +326,6 @@ func TestCreateActor_RejectsSnapshotWithExternalVolumes(t *testing.T) {
}},
Volumes: []*ateapipb.Volume{{
Name: "data",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
Capacity: "1Gi", StorageClassName: "standard",
},
Expand Down Expand Up @@ -1235,7 +1233,6 @@ func TestActorLifecycle_WithExternalVolumes(t *testing.T) {
volumes := []*ateapipb.Volume{
{
Name: "data-vol",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "fast",
Capacity: "20Gi",
Expand Down Expand Up @@ -1377,15 +1374,13 @@ func TestResumeActor_VolumeCreationFailure(t *testing.T) {
volumes := []*ateapipb.Volume{
{
Name: "succ-vol1",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
Capacity: "10Gi",
},
},
{
Name: "fail-vol2",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
Capacity: "10Gi",
Expand Down Expand Up @@ -1521,15 +1516,13 @@ func TestResumeActor_VolumeCreationRetrySuccess(t *testing.T) {
volumes := []*ateapipb.Volume{
{
Name: "succ-vol1",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
Capacity: "10Gi",
},
},
{
Name: "retry-vol2",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
Capacity: "10Gi",
Expand Down
7 changes: 0 additions & 7 deletions cmd/ateapi/internal/controlapi/volumes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func TestInitialActorVolumes_PendingState(t *testing.T) {
Volumes: []*ateapipb.Volume{
{
Name: "data-vol-1",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
},
Expand All @@ -64,12 +63,10 @@ func TestInitialActorVolumes_PendingState(t *testing.T) {
},
{
Name: "durable-vol",
Type: "DurableDir",
DurableDir: &ateapipb.DurableDirVolumeSource{},
},
{
Name: "data-vol-2",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "fast",
},
Expand Down Expand Up @@ -118,7 +115,6 @@ func TestCreateActorVolumes(t *testing.T) {
Volumes: []*ateapipb.Volume{
{
Name: "data-vol",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
},
Expand All @@ -130,21 +126,18 @@ func TestCreateActorVolumes(t *testing.T) {
Volumes: []*ateapipb.Volume{
{
Name: "vol1",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
},
},
{
Name: "vol2",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
},
},
{
Name: "vol3",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "standard",
},
Expand Down
15 changes: 5 additions & 10 deletions cmd/ateapi/internal/controlapi/workload_spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestWorkloadSpecFromActorTemplate(t *testing.T) {
template: &ateapipb.ActorTemplate{
Metadata: &ateapipb.ResourceMetadata{Atespace: "agent-ns", Name: "tmpl1"},
Volumes: []*ateapipb.Volume{
{Name: "home", Type: "DurableDir", DurableDir: &ateapipb.DurableDirVolumeSource{}},
{Name: "home", DurableDir: &ateapipb.DurableDirVolumeSource{}},
},
Containers: []*ateapipb.Container{
{
Expand Down Expand Up @@ -73,7 +73,6 @@ func TestWorkloadSpecFromActorTemplate(t *testing.T) {
Volumes: []*ateapipb.Volume{
{
Name: "system-info",
Type: "SystemInfo",
SystemInfo: &ateapipb.SystemInfoVolumeSource{
DataSources: []*ateapipb.SystemInfoDataSource{
{ActorMetadata: &ateapipb.ActorMetadataDataSource{
Expand Down Expand Up @@ -134,8 +133,8 @@ func TestWorkloadSpecFromActorTemplate(t *testing.T) {
template: &ateapipb.ActorTemplate{
Metadata: &ateapipb.ResourceMetadata{Atespace: "agent-ns", Name: "tmpl1"},
Volumes: []*ateapipb.Volume{
{Name: "home", Type: "DurableDir", DurableDir: &ateapipb.DurableDirVolumeSource{}},
{Name: "agent", Type: "Image", Image: &ateapipb.ImageVolumeSource{Reference: "example.com/agent@sha256:abc"}},
{Name: "home", DurableDir: &ateapipb.DurableDirVolumeSource{}},
{Name: "agent", Image: &ateapipb.ImageVolumeSource{Reference: "example.com/agent@sha256:abc"}},
},
Containers: []*ateapipb.Container{
{
Expand Down Expand Up @@ -178,7 +177,6 @@ func TestWorkloadSpecFromActorTemplate(t *testing.T) {
Volumes: []*ateapipb.Volume{
{
Name: "system-info",
Type: "SystemInfo",
SystemInfo: &ateapipb.SystemInfoVolumeSource{
DataSources: []*ateapipb.SystemInfoDataSource{
{TrustBundle: &ateapipb.TrustBundleDataSource{Name: "egress-trust", Path: "trust/ca.pem"}},
Expand Down Expand Up @@ -230,7 +228,7 @@ func TestWorkloadSpecFromActorTemplate(t *testing.T) {
Metadata: &ateapipb.ResourceMetadata{Atespace: "agent-ns", Name: "tmpl1"},
Volumes: []*ateapipb.Volume{
{Name: "unsupported"},
{Name: "home", Type: "DurableDir", DurableDir: &ateapipb.DurableDirVolumeSource{}},
{Name: "home", DurableDir: &ateapipb.DurableDirVolumeSource{}},
},
Containers: []*ateapipb.Container{
{
Expand Down Expand Up @@ -265,7 +263,7 @@ func TestWorkloadSpecFromActorTemplate(t *testing.T) {
template: &ateapipb.ActorTemplate{
Metadata: &ateapipb.ResourceMetadata{Atespace: "agent-ns", Name: "tmpl1"},
Volumes: []*ateapipb.Volume{
{Name: "home", Type: "DurableDir", DurableDir: &ateapipb.DurableDirVolumeSource{}},
{Name: "home", DurableDir: &ateapipb.DurableDirVolumeSource{}},
},
Containers: []*ateapipb.Container{
{Name: "main", Image: "main"},
Expand Down Expand Up @@ -400,19 +398,16 @@ func TestAppendExternalVolumes(t *testing.T) {
Volumes: []*ateapipb.Volume{
{
Name: "vol-1",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "pd-standard",
},
},
{
Name: "vol-2",
Type: "DurableDir",
DurableDir: &ateapipb.DurableDirVolumeSource{},
},
{
Name: "unmounted-vol",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
StorageClassName: "pd-standard",
},
Expand Down
31 changes: 0 additions & 31 deletions cmd/ateapi/internal/controlapi/zz_generated.validation.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions cmd/ateapi/internal/store/storecontract/contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ func newTestActorTemplate(atespace, name string) *ateapipb.ActorTemplate {
Volumes: []*ateapipb.Volume{{
Name: "data",
DurableDir: &ateapipb.DurableDirVolumeSource{},
Type: "DurableDir",
}, {
Name: "system-info",
SystemInfo: &ateapipb.SystemInfoVolumeSource{
Expand All @@ -94,7 +93,6 @@ func newTestActorTemplate(atespace, name string) *ateapipb.ActorTemplate {
}},
},
},
Type: "SystemInfo",
}},
}
}
Expand Down
2 changes: 0 additions & 2 deletions cmd/kubectl-ate/internal/cmd/create_actor_template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ sandboxConfig:
configName: gvisor-default
volumes:
- name: data
type: DurableDir
durableDir: {}
`

Expand Down Expand Up @@ -94,7 +93,6 @@ func TestActorTemplateFromManifest(t *testing.T) {
},
Volumes: []*ateapipb.Volume{{
Name: "data",
Type: "DurableDir",
DurableDir: &ateapipb.DurableDirVolumeSource{},
}},
}
Expand Down
1 change: 0 additions & 1 deletion demos/autoscaled-workerpool/autoscaled-workerpool-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ sandboxConfig:
configName: gvisor-default
volumes:
- name: data
type: DurableDir
durableDir: {}
1 change: 0 additions & 1 deletion demos/counter/counter-microvm-csi-test-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ sandboxConfig:
configName: microvm
volumes:
- name: data
type: ExternalVolumeTemplate
externalVolumeTemplate:
capacity: 1Gi
storageClassName: csi-hostpath-sc
1 change: 0 additions & 1 deletion demos/counter/counter-microvm-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,4 @@ sandboxConfig:
configName: microvm
volumes:
- name: data
type: DurableDir
durableDir: {}
1 change: 0 additions & 1 deletion demos/counter/counter-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,5 @@ sandboxConfig:
configName: gvisor-default
volumes:
- name: data
type: DurableDir
durableDir: {}
${EXTERNAL_VOLUMES}
1 change: 0 additions & 1 deletion demos/egress/egress-microvm-mitm-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ containers:
timeoutSeconds: 120
volumes:
- name: system-info
type: SystemInfo
systemInfo:
dataSources:
# The trust anchors for the per-SNI leaves the MITM egress gateway mints.
Expand Down
1 change: 0 additions & 1 deletion demos/egress/egress-mitm-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ containers:
port: 80
volumes:
- name: system-info
type: SystemInfo
systemInfo:
dataSources:
# The trust anchors for the per-SNI leaves the MITM egress gateway mints.
Expand Down
2 changes: 0 additions & 2 deletions demos/sandbox/manual-test-multi-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ sandboxConfig:
configName: gvisor-default
volumes:
- name: vol-hostpath
type: ExternalVolumeTemplate
externalVolumeTemplate:
capacity: 1Gi
storageClassName: csi-hostpath-sc
- name: vol-nfs
type: ExternalVolumeTemplate
externalVolumeTemplate:
capacity: 1Gi
storageClassName: csi-nfs-sc
2 changes: 1 addition & 1 deletion hack/install-demo-counter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ demo-counter_render() {

validate_cmd=("-e" "s|\${VALIDATE_EXISTING_FILE_PATH_ARG}| - --validate-existing-file-path=/external-data/test.txt|g")
ext_vol_mount_cmd=("-e" "s|\${EXTERNAL_VOLUME_MOUNTS}| - name: external-data\n mountPath: /external-data|g")
ext_vol_spec_cmd=("-e" "s|\${EXTERNAL_VOLUMES}|- name: external-data\n type: ExternalVolumeTemplate\n externalVolumeTemplate:\n capacity: 1Gi\n storageClassName: ${storage_class}|g")
ext_vol_spec_cmd=("-e" "s|\${EXTERNAL_VOLUMES}|- name: external-data\n externalVolumeTemplate:\n capacity: 1Gi\n storageClassName: ${storage_class}|g")
fi

sed -e "s|\${BUCKET_NAME}|${BUCKET_NAME}|g" \
Expand Down
1 change: 0 additions & 1 deletion internal/e2e/fixtures/probe/probe-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ containers:
timeoutSeconds: 60
volumes:
- name: system-info
type: SystemInfo
systemInfo:
dataSources:
- actorMetadata:
Expand Down
2 changes: 0 additions & 2 deletions internal/e2e/suites/demo/demo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,6 @@ func createActorTemplateWithExternalVolume(ctx context.Context, t *testing.T, cl
if !hasExtVol {
at.Volumes = append(at.Volumes, &ateapipb.Volume{
Name: "external-data",
Type: "ExternalVolumeTemplate",
ExternalVolumeTemplate: &ateapipb.ExternalVolumeTemplate{
Capacity: "1Gi",
StorageClassName: scName,
Expand Down Expand Up @@ -1170,7 +1169,6 @@ func createActorTemplateWithTwoDurableDirs(ctx context.Context, t *testing.T, cl
}
at.Volumes = append(at.Volumes, &ateapipb.Volume{
Name: secondDurableDirVolume,
Type: "DurableDir",
DurableDir: &ateapipb.DurableDirVolumeSource{},
})
}
Expand Down
1 change: 0 additions & 1 deletion internal/e2e/suites/imagevolume/imagevolume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ func createTemplate(ctx context.Context, t *testing.T, clients *e2e.Clients, ns
&ateapipb.VolumeMount{Name: "fixture", MountPath: mountPath})
tmpl.Volumes = append(tmpl.Volumes, &ateapipb.Volume{
Name: "fixture",
Type: "Image",
Image: &ateapipb.ImageVolumeSource{Reference: fixtureImage},
})
},
Expand Down
Loading
Loading