From 0825b39710255f9a36da38f0fba9456ea4a4a5b2 Mon Sep 17 00:00:00 2001 From: Nick Hudson Date: Wed, 31 Jan 2024 18:16:57 -0600 Subject: [PATCH] remove watch from delete functions --- conductor/src/lib.rs | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/conductor/src/lib.rs b/conductor/src/lib.rs index f3f72096c..01d5beb9e 100644 --- a/conductor/src/lib.rs +++ b/conductor/src/lib.rs @@ -142,25 +142,6 @@ pub async fn delete(client: Client, namespace: &str, name: &str) -> Result<(), C .await .map_err(ConductorError::KubeError); - // Watch for deletion - let wp = WatchParams { - field_selector: Some(format!("metadata.name={}", name)), - ..WatchParams::default() - }; - let stream = coredb_api - .watch(&wp, "0") - .await - .map_err(ConductorError::KubeError)?; - - let mut pinned_stream = Box::pin(stream); - - while let Some(status) = pinned_stream.try_next().await? { - if let WatchEvent::Deleted(_) = status { - info!("CoreDB {} deleted", name); - return Ok(()); - } - } - Ok(()) } @@ -211,24 +192,6 @@ pub async fn delete_namespace(client: Client, name: &str) -> Result<(), Conducto .await .map_err(ConductorError::KubeError); - // Watch for deletion - let wp = WatchParams { - field_selector: Some(format!("metadata.name={}", name)), - ..WatchParams::default() - }; - let stream = ns_api - .watch(&wp, "0") - .await - .map_err(ConductorError::KubeError)?; - - let mut pinned_stream = Box::pin(stream); - - while let Some(status) = pinned_stream.try_next().await? { - if let WatchEvent::Deleted(_) = status { - info!("Namespace {} deleted", name); - return Ok(()); - } - } Ok(()) }