diff options
Diffstat (limited to 'robusta_krr')
| -rw-r--r-- | robusta_krr/core/integrations/kubernetes.py | 2 | ||||
| -rw-r--r-- | robusta_krr/core/runner.py | 16 | ||||
| -rw-r--r-- | robusta_krr/utils/progress_bar.py | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/robusta_krr/core/integrations/kubernetes.py b/robusta_krr/core/integrations/kubernetes.py index d8f0978..74a3856 100644 --- a/robusta_krr/core/integrations/kubernetes.py +++ b/robusta_krr/core/integrations/kubernetes.py @@ -23,7 +23,7 @@ from kubernetes.client.models import ( V2HorizontalPodAutoscalerList, ) -from robusta_krr.core.models.objects import HPAData, K8sObjectData, PodData +from robusta_krr.core.models.objects import HPAData, K8sObjectData from robusta_krr.core.models.result import ResourceAllocations from robusta_krr.utils.configurable import Configurable diff --git a/robusta_krr/core/runner.py b/robusta_krr/core/runner.py index 53b7aa5..3d8907f 100644 --- a/robusta_krr/core/runner.py +++ b/robusta_krr/core/runner.py @@ -120,8 +120,6 @@ class Runner(Configurable): step=self._strategy.settings.timeframe_timedelta, ) - # self.__progressbar.progress() - self.debug(f"Calculating recommendations for {object} with {len(metrics)} metrics") # NOTE: We run this in a threadpool as the strategy calculation might be CPU intensive @@ -133,6 +131,8 @@ class Runner(Configurable): async def _gather_object_allocations(self, k8s_object: K8sObjectData) -> ResourceScan: recommendation = await self._calculate_object_recommendations(k8s_object) + self.__progressbar.progress() + return ResourceScan.calculate( k8s_object, ResourceAllocations( @@ -153,13 +153,13 @@ class Runner(Configurable): self.info(f'Using clusters: {clusters if clusters is not None else "inner cluster"}') - # with ProgressBar(self.config, total=len(objects), title="Calculating Recommendation") as self.__progressbar: - scans_tasks = [ - asyncio.create_task(self._gather_object_allocations(k8s_object)) - async for k8s_object in self._k8s_loader.list_scannable_objects(clusters) - ] + with ProgressBar(self.config, title="Calculating Recommendation") as self.__progressbar: + scans_tasks = [ + asyncio.create_task(self._gather_object_allocations(k8s_object)) + async for k8s_object in self._k8s_loader.list_scannable_objects(clusters) + ] - scans = await asyncio.gather(*scans_tasks) + scans = await asyncio.gather(*scans_tasks) if len(scans) == 0: self.warning("Current filters resulted in no objects available to scan.") diff --git a/robusta_krr/utils/progress_bar.py b/robusta_krr/utils/progress_bar.py index 621dc18..32bf211 100644 --- a/robusta_krr/utils/progress_bar.py +++ b/robusta_krr/utils/progress_bar.py @@ -14,7 +14,7 @@ class ProgressBar(Configurable): def __init__(self, config: Config, **kwargs) -> None: super().__init__(config) - self.show_bar = self.echo_active and False + self.show_bar = self.echo_active if self.show_bar: self.alive_bar = alive_bar(**kwargs) |