Skip to content

Commit 2e7b2c5

Browse files
committed
fix(driver-k8s): harden list path and tighten label selectors
- Add warning log to list_sandboxes() filter_map so skipped objects are visible in logs instead of silently dropped. - Add LABEL_SANDBOX_ID existence requirement to both list and watch label selectors so managed-but-non-sandbox resources (e.g. warm pool pods without sandbox identity) never enter either code path. Signed-off-by: Roland Huß <[email protected]> Assisted-By: 🤖 Claude Code
1 parent 8d9502d commit 2e7b2c5

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

  • crates/openshell-driver-kubernetes/src

‎crates/openshell-driver-kubernetes/src/driver.rs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -744,19 +744,28 @@ impl KubernetesComputeDriver {
744744
.await?;
745745
match tokio::time::timeout(
746746
KUBE_API_TIMEOUT,
747-
agent_sandbox_api.api.list(
748-
&ListParams::default()
749-
.labels(&format!("{LABEL_MANAGED_BY}={LABEL_MANAGED_BY_VALUE}")),
750-
),
747+
agent_sandbox_api
748+
.api
749+
.list(&ListParams::default().labels(&format!(
750+
"{LABEL_MANAGED_BY}={LABEL_MANAGED_BY_VALUE},{LABEL_SANDBOX_ID}"
751+
))),
751752
)
752753
.await
753754
{
754755
Ok(Ok(list)) => {
755756
let mut sandboxes: Vec<Sandbox> = list
756757
.items
757758
.into_iter()
758-
.filter_map(|obj| sandbox_from_object(&self.config.namespace, obj).ok())
759-
.map(|(_, s)| s)
759+
.filter_map(|obj| {
760+
let name = obj.metadata.name.clone().unwrap_or_default();
761+
match sandbox_from_object(&self.config.namespace, obj) {
762+
Ok((_, s)) => Some(s),
763+
Err(err) => {
764+
warn!(object_name = %name, error = %err, "skipping unrecognized Sandbox in list");
765+
None
766+
}
767+
}
768+
})
760769
.collect();
761770
sandboxes.sort_by(|left, right| {
762771
left.name
@@ -1034,8 +1043,9 @@ impl KubernetesComputeDriver {
10341043
.supported_agent_sandbox_api(self.watch_client.clone())
10351044
.await?;
10361045
let event_api: Api<KubeEventObj> = Api::namespaced(self.watch_client.clone(), &namespace);
1037-
let watcher_config = watcher::Config::default()
1038-
.labels(&format!("{LABEL_MANAGED_BY}={LABEL_MANAGED_BY_VALUE}"));
1046+
let watcher_config = watcher::Config::default().labels(&format!(
1047+
"{LABEL_MANAGED_BY}={LABEL_MANAGED_BY_VALUE},{LABEL_SANDBOX_ID}"
1048+
));
10391049
let mut sandbox_stream = watcher::watcher(agent_sandbox_api.api, watcher_config).boxed();
10401050
let mut event_stream = watcher::watcher(event_api, watcher::Config::default()).boxed();
10411051
let (tx, rx) = mpsc::channel(256);

0 commit comments

Comments
 (0)