@@ -733,7 +733,10 @@ impl KubernetesComputeDriver {
733733 . await ?;
734734 match tokio:: time:: timeout (
735735 KUBE_API_TIMEOUT ,
736- agent_sandbox_api. api . list ( & ListParams :: default ( ) ) ,
736+ agent_sandbox_api. api . list (
737+ & ListParams :: default ( )
738+ . labels ( & format ! ( "{LABEL_MANAGED_BY}={LABEL_MANAGED_BY_VALUE}" ) ) ,
739+ ) ,
737740 )
738741 . await
739742 {
@@ -974,8 +977,10 @@ impl KubernetesComputeDriver {
974977 . supported_agent_sandbox_api ( self . watch_client . clone ( ) )
975978 . await ?;
976979 let event_api: Api < KubeEventObj > = Api :: namespaced ( self . watch_client . clone ( ) , & namespace) ;
980+ let sandbox_watcher_config = watcher:: Config :: default ( )
981+ . labels ( & format ! ( "{LABEL_MANAGED_BY}={LABEL_MANAGED_BY_VALUE}" ) ) ;
977982 let mut sandbox_stream =
978- watcher:: watcher ( agent_sandbox_api. api , watcher :: Config :: default ( ) ) . boxed ( ) ;
983+ watcher:: watcher ( agent_sandbox_api. api , sandbox_watcher_config ) . boxed ( ) ;
979984 let mut event_stream = watcher:: watcher ( event_api, watcher:: Config :: default ( ) ) . boxed ( ) ;
980985 let ( tx, rx) = mpsc:: channel ( 256 ) ;
981986
@@ -987,64 +992,52 @@ impl KubernetesComputeDriver {
987992 tokio:: select! {
988993 result = sandbox_stream. try_next( ) => match result {
989994 Ok ( Some ( Event :: Applied ( obj) ) ) => {
990- match sandbox_from_object( & namespace, obj) {
991- Ok ( sandbox) => {
992- update_indexes( & mut sandbox_name_to_id, & mut agent_pod_to_id, & sandbox) ;
993- let event = WatchSandboxesEvent {
994- payload: Some ( watch_sandboxes_event:: Payload :: Sandbox (
995- WatchSandboxesSandboxEvent { sandbox: Some ( sandbox) }
996- ) ) ,
997- } ;
998- if tx. send( Ok ( event) ) . await . is_err( ) {
999- break ;
1000- }
1001- }
1002- Err ( err) => {
1003- if tx. send( Err ( KubernetesDriverError :: Message ( err) ) ) . await . is_err( ) {
1004- break ;
1005- }
1006- }
995+ let obj_name = obj. metadata. name. clone( ) . unwrap_or_default( ) ;
996+ let Ok ( sandbox) = sandbox_from_object( & namespace, obj) else {
997+ debug!( object_name = %obj_name, "skipping non-gateway Sandbox in Applied event" ) ;
998+ continue ;
999+ } ;
1000+ update_indexes( & mut sandbox_name_to_id, & mut agent_pod_to_id, & sandbox) ;
1001+ let event = WatchSandboxesEvent {
1002+ payload: Some ( watch_sandboxes_event:: Payload :: Sandbox (
1003+ WatchSandboxesSandboxEvent { sandbox: Some ( sandbox) }
1004+ ) ) ,
1005+ } ;
1006+ if tx. send( Ok ( event) ) . await . is_err( ) {
1007+ break ;
10071008 }
10081009 }
10091010 Ok ( Some ( Event :: Deleted ( obj) ) ) => {
1010- match sandbox_id_from_object( & obj) {
1011- Ok ( sandbox_id) => {
1012- remove_indexes( & mut sandbox_name_to_id, & mut agent_pod_to_id, & sandbox_id) ;
1013- let event = WatchSandboxesEvent {
1014- payload: Some ( watch_sandboxes_event:: Payload :: Deleted (
1015- WatchSandboxesDeletedEvent { sandbox_id }
1016- ) ) ,
1017- } ;
1018- if tx. send( Ok ( event) ) . await . is_err( ) {
1019- break ;
1020- }
1021- }
1022- Err ( err) => {
1023- if tx. send( Err ( KubernetesDriverError :: Message ( err) ) ) . await . is_err( ) {
1024- break ;
1025- }
1026- }
1011+ let obj_name = obj. metadata. name. clone( ) . unwrap_or_default( ) ;
1012+ let Ok ( sandbox_id) = sandbox_id_from_object( & obj) else {
1013+ debug!( object_name = %obj_name, "skipping non-gateway Sandbox in Deleted event" ) ;
1014+ continue ;
1015+ } ;
1016+ remove_indexes( & mut sandbox_name_to_id, & mut agent_pod_to_id, & sandbox_id) ;
1017+ let event = WatchSandboxesEvent {
1018+ payload: Some ( watch_sandboxes_event:: Payload :: Deleted (
1019+ WatchSandboxesDeletedEvent { sandbox_id }
1020+ ) ) ,
1021+ } ;
1022+ if tx. send( Ok ( event) ) . await . is_err( ) {
1023+ break ;
10271024 }
10281025 }
10291026 Ok ( Some ( Event :: Restarted ( objs) ) ) => {
10301027 for obj in objs {
1031- match sandbox_from_object( & namespace, obj) {
1032- Ok ( sandbox) => {
1033- update_indexes( & mut sandbox_name_to_id, & mut agent_pod_to_id, & sandbox) ;
1034- let event = WatchSandboxesEvent {
1035- payload: Some ( watch_sandboxes_event:: Payload :: Sandbox (
1036- WatchSandboxesSandboxEvent { sandbox: Some ( sandbox) }
1037- ) ) ,
1038- } ;
1039- if tx. send( Ok ( event) ) . await . is_err( ) {
1040- return ;
1041- }
1042- }
1043- Err ( err) => {
1044- if tx. send( Err ( KubernetesDriverError :: Message ( err) ) ) . await . is_err( ) {
1045- return ;
1046- }
1047- }
1028+ let obj_name = obj. metadata. name. clone( ) . unwrap_or_default( ) ;
1029+ let Ok ( sandbox) = sandbox_from_object( & namespace, obj) else {
1030+ debug!( object_name = %obj_name, "skipping non-gateway Sandbox in Restarted event" ) ;
1031+ continue ;
1032+ } ;
1033+ update_indexes( & mut sandbox_name_to_id, & mut agent_pod_to_id, & sandbox) ;
1034+ let event = WatchSandboxesEvent {
1035+ payload: Some ( watch_sandboxes_event:: Payload :: Sandbox (
1036+ WatchSandboxesSandboxEvent { sandbox: Some ( sandbox) }
1037+ ) ) ,
1038+ } ;
1039+ if tx. send( Ok ( event) ) . await . is_err( ) {
1040+ return ;
10481041 }
10491042 }
10501043 }
@@ -5617,4 +5610,72 @@ mod tests {
56175610 assert ! ( validate_kubernetes_dns1123_label( "MySandbox" , "sandbox name" ) . is_err( ) ) ;
56185611 assert ! ( validate_kubernetes_dns1123_label( "dotted.name" , "sandbox name" ) . is_err( ) ) ;
56195612 }
5613+
5614+ fn make_dynamic_object ( name : & str , labels : Option < BTreeMap < String , String > > ) -> DynamicObject {
5615+ DynamicObject {
5616+ metadata : ObjectMeta {
5617+ name : Some ( name. to_string ( ) ) ,
5618+ namespace : Some ( "test-ns" . to_string ( ) ) ,
5619+ labels,
5620+ ..Default :: default ( )
5621+ } ,
5622+ types : None ,
5623+ data : serde_json:: json!( { } ) ,
5624+ }
5625+ }
5626+
5627+ #[ test]
5628+ fn test_sandbox_id_from_object_with_label ( ) {
5629+ let mut labels = BTreeMap :: new ( ) ;
5630+ labels. insert ( LABEL_SANDBOX_ID . to_string ( ) , "my-sandbox-id" . to_string ( ) ) ;
5631+ let obj = make_dynamic_object ( "sandbox-obj" , Some ( labels) ) ;
5632+ let result = sandbox_id_from_object ( & obj) ;
5633+ assert_eq ! ( result, Ok ( "my-sandbox-id" . to_string( ) ) ) ;
5634+ }
5635+
5636+ #[ test]
5637+ fn test_sandbox_id_from_object_with_name_prefix ( ) {
5638+ let obj = make_dynamic_object ( "sandbox-abc123" , None ) ;
5639+ let result = sandbox_id_from_object ( & obj) ;
5640+ assert_eq ! ( result, Ok ( "abc123" . to_string( ) ) ) ;
5641+ }
5642+
5643+ #[ test]
5644+ fn test_sandbox_id_from_object_unknown ( ) {
5645+ let obj = make_dynamic_object ( "openshell-warm-pool-xyz" , None ) ;
5646+ let result = sandbox_id_from_object ( & obj) ;
5647+ assert ! ( result. is_err( ) ) ;
5648+ }
5649+
5650+ #[ test]
5651+ fn test_sandbox_id_from_object_managed_by_but_no_sandbox_id ( ) {
5652+ let mut labels = BTreeMap :: new ( ) ;
5653+ labels. insert (
5654+ LABEL_MANAGED_BY . to_string ( ) ,
5655+ LABEL_MANAGED_BY_VALUE . to_string ( ) ,
5656+ ) ;
5657+ let obj = make_dynamic_object ( "openshell-warm-pool-xyz" , Some ( labels) ) ;
5658+ let result = sandbox_id_from_object ( & obj) ;
5659+ assert ! ( result. is_err( ) ) ;
5660+ }
5661+
5662+ #[ test]
5663+ fn test_sandbox_from_object_success ( ) {
5664+ let mut labels = BTreeMap :: new ( ) ;
5665+ labels. insert ( LABEL_SANDBOX_ID . to_string ( ) , "test-id" . to_string ( ) ) ;
5666+ let obj = make_dynamic_object ( "sandbox-test-id" , Some ( labels) ) ;
5667+ let result = sandbox_from_object ( "test-ns" , obj) ;
5668+ assert ! ( result. is_ok( ) ) ;
5669+ let sandbox = result. unwrap ( ) ;
5670+ assert_eq ! ( sandbox. id, "test-id" ) ;
5671+ assert_eq ! ( sandbox. name, "sandbox-test-id" ) ;
5672+ assert_eq ! ( sandbox. namespace, "test-ns" ) ;
5673+ }
5674+
5675+ #[ test]
5676+ fn test_sandbox_from_object_unknown ( ) {
5677+ let obj = make_dynamic_object ( "openshell-warm-pool-abc" , None ) ;
5678+ let result = sandbox_from_object ( "test-ns" , obj) ;
5679+ assert ! ( result. is_err( ) ) ;
5680+ }
56205681}
0 commit comments