Skip to content

Commit 2501507

Browse files
Merge branch 'main' into surbhi/device_lifecycle
2 parents eb13746 + 36b3fce commit 2501507

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.github/workflows/buf-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
buf:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e # v4.2.0
14+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.2.0
1515
- uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
1616
with:
1717
# Publishing schema changes to the BSR requires a BSR authentication token.

protect/control/v1/common.proto

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ enum ZoneVirtualizationBackend {
9090
ZONE_VIRTUALIZATION_BACKEND_UNKNOWN = 0;
9191
ZONE_VIRTUALIZATION_BACKEND_PV = 1;
9292
ZONE_VIRTUALIZATION_BACKEND_PVH = 2;
93+
ZONE_VIRTUALIZATION_BACKEND_AUTOMATIC = 3;
9394
}
9495

9596
message OciImageSpec {
@@ -308,6 +309,12 @@ message WorkloadSpec {
308309
repeated MountSpec mounts = 6;
309310
WorkloadSecuritySpec security = 7;
310311
repeated WorkloadScratchMount scratch_mount = 8;
312+
repeated CgroupLimit cgroup_limits = 9;
313+
}
314+
315+
message CgroupLimit {
316+
string limit_name = 1;
317+
string value = 2;
311318
}
312319

313320
message WorkloadScratchMount {
@@ -322,6 +329,7 @@ message WorkloadSecuritySpec {
322329
bool privileged = 5;
323330
bool disable_all_namespaces = 6;
324331
repeated ProcessNamespace disable_namespaces = 7;
332+
bool read_only_rootfs = 8;
325333
}
326334

327335
enum WorkloadState {
@@ -355,15 +363,15 @@ message WorkloadBlockDeviceStatus {
355363
}
356364

357365
message WorkloadMountInfo {
358-
uint64 device_id = 1;
359366
string tag = 2;
360-
string host_directory = 3;
361-
string host_file = 4;
367+
string host_path = 3;
362368
string target_path = 5;
369+
reserved 1, 4;
363370
}
364371

365372
message WorkloadMountStatus {
366-
repeated WorkloadMountInfo devices = 1;
373+
repeated WorkloadMountInfo mounts = 2;
374+
reserved 1;
367375
}
368376

369377
message WorkloadExitStatus {
@@ -488,6 +496,7 @@ message ZoneScratchDiskSpecStaticBlock {
488496

489497
message ZoneDeviceStatus {
490498
repeated ZoneDiskStatus disks = 1;
499+
ZoneMountStatus mount = 2;
491500
}
492501

493502
enum ZoneDiskStatusDiskPurpose {
@@ -505,6 +514,12 @@ message ZoneDiskStatus {
505514
bool delete = 6;
506515
}
507516

517+
message ZoneMountStatus {
518+
uint64 device_id = 1;
519+
string host_path = 2;
520+
string tag = 3;
521+
}
522+
508523
message OciRegistryUsernamePassword {
509524
// username to provide, empty means no username.
510525
string username = 1;

protect/control/v1/control.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ message GetHostStatusReply {
6767
string host_ipv4 = 4;
6868
string host_ipv6 = 5;
6969
string host_mac = 6;
70+
optional uint64 hyp_free_mem = 7;
7071
}
7172

7273
message DeviceStateRequest {
@@ -557,6 +558,7 @@ message StartWorkloadReply {}
557558

558559
message StopWorkloadRequest {
559560
string workload_id = 1;
561+
uint64 timeout = 2;
560562
}
561563

562564
message StopWorkloadReply {}

0 commit comments

Comments
 (0)