Skip to content

Commit 0810025

Browse files
fix(k8s): stop pods in workspace namespace
Signed-off-by: Derek Carr <[email protected]>
1 parent 9428d30 commit 0810025

2 files changed

Lines changed: 61 additions & 4 deletions

File tree

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,11 +1486,11 @@ impl KubernetesComputeDriver {
14861486
}
14871487

14881488
pub async fn stop_sandbox(&self, sandbox_id: &str) -> Result<(), String> {
1489-
let (agent_sandbox_api, kube_name, pod_name, stop_timeout) = self
1489+
let (agent_sandbox_api, kube_name, pod_name, namespace, stop_timeout) = self
14901490
.patch_sandbox_operating_state(sandbox_id, false)
14911491
.await?;
14921492
let legacy_pod_api = (agent_sandbox_api.resource.version == SANDBOX_VERSION_V1ALPHA1)
1493-
.then(|| Api::<Pod>::namespaced(self.client.clone(), &self.config.namespace));
1493+
.then(|| Api::<Pod>::namespaced(self.client.clone(), &namespace));
14941494

14951495
let deadline = tokio::time::Instant::now() + stop_timeout;
14961496
let mut poll_interval = STOP_INITIAL_POLL_INTERVAL;
@@ -1548,7 +1548,7 @@ impl KubernetesComputeDriver {
15481548
&self,
15491549
sandbox_id: &str,
15501550
running: bool,
1551-
) -> Result<(AgentSandboxApi, String, String, Duration), String> {
1551+
) -> Result<(AgentSandboxApi, String, String, String, Duration), String> {
15521552
let lookup_api = self
15531553
.supported_sandbox_api_for_lookup(self.client.clone())
15541554
.await?;
@@ -1623,7 +1623,13 @@ impl KubernetesComputeDriver {
16231623
running,
16241624
"Updated Kubernetes sandbox operating state"
16251625
);
1626-
Ok((agent_sandbox_api, kube_name, pod_name, stop_timeout))
1626+
Ok((
1627+
agent_sandbox_api,
1628+
kube_name,
1629+
pod_name,
1630+
namespace,
1631+
stop_timeout,
1632+
))
16271633
}
16281634

16291635
pub async fn delete_sandbox(&self, sandbox_id: &str) -> Result<bool, String> {

‎e2e/rust/tests/workspace_namespace_managed.rs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,57 @@ async fn managed_full_lifecycle_with_multiple_sandboxes() {
667667
}
668668
}
669669

670+
#[tokio::test]
671+
async fn managed_stop_waits_for_workspace_pod_to_disappear() {
672+
let ws = unique_workspace("mgdstop");
673+
let ns = managed_namespace(&ws);
674+
let sandbox = "stop-sb";
675+
let _cleanup = ManagedCleanup {
676+
workspace: ws.clone(),
677+
sandboxes: vec![sandbox.into()],
678+
};
679+
680+
let (ok, out) = run_cli(&["workspace", "create", "--name", &ws]).await;
681+
assert!(ok, "workspace create failed: {out}");
682+
683+
let (ok, out) = run_cli(&[
684+
"sandbox",
685+
"create",
686+
"--workspace",
687+
&ws,
688+
"--name",
689+
sandbox,
690+
"--",
691+
"echo",
692+
"ready",
693+
])
694+
.await;
695+
assert!(ok, "sandbox create failed: {out}");
696+
697+
let (ok, pod_name) = kubectl(&[
698+
"get",
699+
"sandbox",
700+
sandbox,
701+
"-n",
702+
&ns,
703+
"-o",
704+
"jsonpath={.metadata.annotations.agents\\.x-k8s\\.io/pod-name}",
705+
])
706+
.await;
707+
assert!(ok, "failed to resolve sandbox pod name: {pod_name}");
708+
let pod_name = pod_name.trim();
709+
assert!(!pod_name.is_empty(), "sandbox pod annotation was empty");
710+
711+
let (ok, out) = run_cli(&["sandbox", "stop", sandbox, "--workspace", &ws]).await;
712+
assert!(ok, "sandbox stop failed: {out}");
713+
714+
let (exists, out) = kubectl(&["get", "pod", pod_name, "-n", &ns]).await;
715+
assert!(
716+
!exists,
717+
"sandbox stop returned before workspace pod {pod_name} disappeared: {out}"
718+
);
719+
}
720+
670721
#[tokio::test]
671722
async fn managed_rejects_invalid_dns1123_sandbox_name() {
672723
let ws = unique_workspace("mgddns");

0 commit comments

Comments
 (0)