@@ -88,6 +88,35 @@ impl FromStr for SupervisorTopology {
8888 }
8989}
9090
91+ #[ derive( Debug , Clone , Serialize , Deserialize ) ]
92+ #[ serde( default , deny_unknown_fields) ]
93+ pub struct KubernetesSidecarConfig {
94+ /// UID used by the long-running network sidecar in `sidecar` topology.
95+ /// The network init container installs nftables rules that exempt this
96+ /// UID, so it must not match the sandbox workload UID.
97+ pub proxy_uid : u32 ,
98+ }
99+
100+ impl Default for KubernetesSidecarConfig {
101+ fn default ( ) -> Self {
102+ Self {
103+ proxy_uid : DEFAULT_PROXY_UID ,
104+ }
105+ }
106+ }
107+
108+ impl KubernetesSidecarConfig {
109+ pub fn validate_proxy_uid ( & self ) -> Result < ( ) , String > {
110+ if self . proxy_uid < openshell_policy:: MIN_SANDBOX_UID {
111+ return Err ( format ! (
112+ "sidecar.proxy_uid must be at least {}" ,
113+ openshell_policy:: MIN_SANDBOX_UID
114+ ) ) ;
115+ }
116+ Ok ( ( ) )
117+ }
118+ }
119+
91120/// Kubernetes `AppArmor` profile requested for the sandbox agent container.
92121#[ derive( Debug , Clone , PartialEq , Eq ) ]
93122pub enum AppArmorProfile {
@@ -213,11 +242,9 @@ pub struct KubernetesComputeConfig {
213242 /// How the supervisor binary is delivered into sandbox pods.
214243 pub supervisor_sideload_method : SupervisorSideloadMethod ,
215244 /// How the supervisor is arranged for Kubernetes sandbox pods.
216- pub supervisor_topology : SupervisorTopology ,
217- /// UID used by the long-running network sidecar in `sidecar` topology.
218- /// The network init container installs nftables rules that exempt this
219- /// UID, so it must not match the sandbox workload UID.
220- pub proxy_uid : u32 ,
245+ pub topology : SupervisorTopology ,
246+ /// Sidecar-only settings used when `topology = "sidecar"`.
247+ pub sidecar : KubernetesSidecarConfig ,
221248 pub grpc_endpoint : String ,
222249 pub ssh_socket_path : String ,
223250 pub client_tls_secret_name : String ,
@@ -303,8 +330,8 @@ impl Default for KubernetesComputeConfig {
303330 supervisor_image : DEFAULT_SUPERVISOR_IMAGE . to_string ( ) ,
304331 supervisor_image_pull_policy : String :: new ( ) ,
305332 supervisor_sideload_method : SupervisorSideloadMethod :: default ( ) ,
306- supervisor_topology : SupervisorTopology :: default ( ) ,
307- proxy_uid : DEFAULT_PROXY_UID ,
333+ topology : SupervisorTopology :: default ( ) ,
334+ sidecar : KubernetesSidecarConfig :: default ( ) ,
308335 grpc_endpoint : String :: new ( ) ,
309336 ssh_socket_path : "/run/openshell/ssh.sock" . to_string ( ) ,
310337 client_tls_secret_name : String :: new ( ) ,
@@ -350,13 +377,7 @@ impl KubernetesComputeConfig {
350377 }
351378
352379 pub fn validate_proxy_uid ( & self ) -> Result < ( ) , String > {
353- if self . proxy_uid < openshell_policy:: MIN_SANDBOX_UID {
354- return Err ( format ! (
355- "proxy_uid must be at least {}" ,
356- openshell_policy:: MIN_SANDBOX_UID
357- ) ) ;
358- }
359- Ok ( ( ) )
380+ self . sidecar . validate_proxy_uid ( )
360381 }
361382
362383 /// Resolve the sandbox UID/GID pair.
@@ -486,65 +507,98 @@ mod tests {
486507 }
487508
488509 #[ test]
489- fn default_supervisor_topology_is_combined ( ) {
510+ fn default_topology_is_combined ( ) {
490511 let cfg = KubernetesComputeConfig :: default ( ) ;
491- assert_eq ! ( cfg. supervisor_topology , SupervisorTopology :: Combined ) ;
492- assert_eq ! ( cfg. supervisor_topology . to_string( ) , "combined" ) ;
512+ assert_eq ! ( cfg. topology , SupervisorTopology :: Combined ) ;
513+ assert_eq ! ( cfg. topology . to_string( ) , "combined" ) ;
493514 }
494515
495516 #[ test]
496517 fn default_proxy_uid_is_dedicated_non_root_uid ( ) {
497518 let cfg = KubernetesComputeConfig :: default ( ) ;
498- assert_eq ! ( cfg. proxy_uid, DEFAULT_PROXY_UID ) ;
519+ assert_eq ! ( cfg. sidecar . proxy_uid, DEFAULT_PROXY_UID ) ;
499520 }
500521
501522 #[ test]
502- fn serde_override_supervisor_topology_sidecar ( ) {
523+ fn serde_override_topology_sidecar ( ) {
503524 let json = serde_json:: json!( {
504- "supervisor_topology " : "sidecar"
525+ "topology " : "sidecar"
505526 } ) ;
506527 let cfg: KubernetesComputeConfig = serde_json:: from_value ( json) . unwrap ( ) ;
507- assert_eq ! ( cfg. supervisor_topology , SupervisorTopology :: Sidecar ) ;
528+ assert_eq ! ( cfg. topology , SupervisorTopology :: Sidecar ) ;
508529 }
509530
510531 #[ test]
511- fn serde_override_supervisor_topology_combined ( ) {
532+ fn serde_override_topology_combined ( ) {
512533 let json = serde_json:: json!( {
513- "supervisor_topology " : "combined"
534+ "topology " : "combined"
514535 } ) ;
515536 let cfg: KubernetesComputeConfig = serde_json:: from_value ( json) . unwrap ( ) ;
516- assert_eq ! ( cfg. supervisor_topology, SupervisorTopology :: Combined ) ;
537+ assert_eq ! ( cfg. topology, SupervisorTopology :: Combined ) ;
538+ }
539+
540+ #[ test]
541+ fn serde_rejects_sidecar_binary_identity_field ( ) {
542+ let json = serde_json:: json!( {
543+ "sidecar" : {
544+ "binary_identity" : "shared-pid"
545+ }
546+ } ) ;
547+ let err = serde_json:: from_value :: < KubernetesComputeConfig > ( json) . unwrap_err ( ) ;
548+ assert ! ( err. to_string( ) . contains( "unknown field" ) ) ;
517549 }
518550
519551 #[ test]
520- fn serde_override_proxy_uid ( ) {
552+ fn serde_override_sidecar_proxy_uid_nested ( ) {
521553 let json = serde_json:: json!( {
522- "proxy_uid" : 2000
554+ "sidecar" : {
555+ "proxy_uid" : 2000
556+ }
523557 } ) ;
524558 let cfg: KubernetesComputeConfig = serde_json:: from_value ( json) . unwrap ( ) ;
525- assert_eq ! ( cfg. proxy_uid, 2000 ) ;
559+ assert_eq ! ( cfg. sidecar . proxy_uid, 2000 ) ;
526560 cfg. validate_proxy_uid ( ) . unwrap ( ) ;
527561 }
528562
529563 #[ test]
530564 fn validate_proxy_uid_rejects_privileged_uid ( ) {
531565 let cfg = KubernetesComputeConfig {
532- proxy_uid : 999 ,
566+ sidecar : KubernetesSidecarConfig { proxy_uid : 999 } ,
533567 ..KubernetesComputeConfig :: default ( )
534568 } ;
535569 let err = cfg. validate_proxy_uid ( ) . unwrap_err ( ) ;
536570 assert ! ( err. contains( "proxy_uid" ) ) ;
537571 }
538572
539573 #[ test]
540- fn serde_rejects_invalid_supervisor_topology ( ) {
574+ fn serde_rejects_invalid_topology ( ) {
541575 let json = serde_json:: json!( {
542- "supervisor_topology " : "unsupported"
576+ "topology " : "unsupported"
543577 } ) ;
544578 let err = serde_json:: from_value :: < KubernetesComputeConfig > ( json) . unwrap_err ( ) ;
545579 assert ! ( err. to_string( ) . contains( "unknown variant" ) ) ;
546580 }
547581
582+ #[ test]
583+ fn serde_rejects_removed_supervisor_topology_field ( ) {
584+ let json = serde_json:: json!( {
585+ "supervisor_topology" : "sidecar"
586+ } ) ;
587+ let err = serde_json:: from_value :: < KubernetesComputeConfig > ( json) . unwrap_err ( ) ;
588+ assert ! ( err. to_string( ) . contains( "unknown field" ) ) ;
589+ }
590+
591+ #[ test]
592+ fn serde_rejects_removed_flat_sidecar_fields ( ) {
593+ for json in [
594+ serde_json:: json!( { "sidecar_binary_identity" : "shared-pid" } ) ,
595+ serde_json:: json!( { "proxy_uid" : 2000 } ) ,
596+ ] {
597+ let err = serde_json:: from_value :: < KubernetesComputeConfig > ( json) . unwrap_err ( ) ;
598+ assert ! ( err. to_string( ) . contains( "unknown field" ) ) ;
599+ }
600+ }
601+
548602 #[ test]
549603 fn serde_rejects_removed_process_enforcement_field ( ) {
550604 let json = serde_json:: json!( {
0 commit comments