From 4d7c21830d6f28c69e070e32356131fa02c81848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Smolarek?= <34063647+Razz4780@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:07:11 +0200 Subject: [PATCH] Restored (#2735) --- changelog.d/ls-concurrency.internal.md | 1 + mirrord/kube/src/api/kubernetes/seeker.rs | 26 +++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 changelog.d/ls-concurrency.internal.md diff --git a/changelog.d/ls-concurrency.internal.md b/changelog.d/ls-concurrency.internal.md new file mode 100644 index 00000000000..7792fabe87e --- /dev/null +++ b/changelog.d/ls-concurrency.internal.md @@ -0,0 +1 @@ +Restored concurrency in `mirrord ls` list requests. \ No newline at end of file diff --git a/mirrord/kube/src/api/kubernetes/seeker.rs b/mirrord/kube/src/api/kubernetes/seeker.rs index 97c6b1a93d0..667f6d404c7 100644 --- a/mirrord/kube/src/api/kubernetes/seeker.rs +++ b/mirrord/kube/src/api/kubernetes/seeker.rs @@ -30,9 +30,11 @@ impl KubeResourceSeeker<'_> { /// Returns all resource types that don't require the operator to operate ie. [`Pod`], /// [`Deployment`] and [`Rollout`] pub async fn all_open_source(&self) -> Result> { - let pods = self.pods().await?; - let deployments = self.deployments().await?; - let rollouts = self.simple_list_resource::("rollout").await?; + let (pods, deployments, rollouts) = tokio::try_join!( + self.pods(), + self.deployments(), + self.simple_list_resource::("rollout") + )?; Ok(pods .into_iter() @@ -44,16 +46,14 @@ impl KubeResourceSeeker<'_> { /// Returns all resource types ie. [`Pod`], [`Deployment`], [`Rollout`], [`Job`], [`CronJob`], /// and [`StatefulSet`] pub async fn all(&self) -> Result> { - let pods = self.pods().await?; - let deployments = self - .simple_list_resource::("deployment") - .await?; - let rollouts = self.simple_list_resource::("rollout").await?; - let jobs = self.simple_list_resource::("job").await?; - let cronjobs = self.simple_list_resource::("cronjob").await?; - let statefulsets = self - .simple_list_resource::("statefulset") - .await?; + let (pods, deployments, rollouts, jobs, cronjobs, statefulsets) = tokio::try_join!( + self.pods(), + self.simple_list_resource::("deployment"), + self.simple_list_resource::("rollout"), + self.simple_list_resource::("job"), + self.simple_list_resource::("cronjob"), + self.simple_list_resource::("statefulset"), + )?; Ok(pods .into_iter()