Merge branch 'main' into surbhi/device-db

Author: Sweetsurbhi88

buf.yaml

@@ -16,5 +16,17 @@ lint:
   use:
     - STANDARD
 breaking:
+  ignore_only:
+    FIELD_SAME_NAME:
+      - protect/control/v1/
+    FIELD_SAME_JSON_NAME:
+      - protect/control/v1/
+    EXTENSION_NO_DELETE:
+      - protect/control/v1/
+    ENUM_VALUE_NO_DELETE:
+      - protect/control/v1/
+    FIELD_NO_DELETE:
+      - protect/control/v1/
   use:
+    - WIRE_JSON
     - FILE

protect/control/v1/common.proto

@@ -133,6 +133,7 @@ message ProcessSpec {
   bool stdout = 9;
   bool stderr = 10;
   reserved 11, 12;
+  repeated int64 additional_gids = 13;
 }
 
 message MountSpec {
@@ -183,7 +184,8 @@ enum ZoneState {
   ZONE_STATE_CREATING = 1;
   ZONE_STATE_CREATED = 2;
   ZONE_STATE_READY = 3;
-  ZONE_STATE_EXITED = 4;
+  reserved 4;
+  reserved "ZONE_STATE_EXITED";
   ZONE_STATE_DESTROYING = 5;
   ZONE_STATE_DESTROYED = 6;
   ZONE_STATE_FAILED = 7;
@@ -323,6 +325,7 @@ message WorkloadSpec {
   repeated CgroupLimit cgroup_limits = 9;
   string hostname = 10;
   repeated WorkloadBlockDeviceSpec block_devices = 11;
+  optional int32 oom_score_adj = 12;
 }
 
 message CgroupLimit {

protect/control/v1/control.proto

@@ -72,6 +72,10 @@ message GetHostStatusReply {
   string host_ipv6 = 5;
   string host_mac = 6;
   optional uint64 hyp_free_mem = 7;
+  optional string protect_git_sha = 8;
+  optional string protect_last_tag = 9;
+  optional uint64 protect_revs_since_tag = 10;
+  optional string protect_branch = 11;
 }
 
 message UpdateDeviceStateRequest {