diff --git a/getdeck/cli/get.py b/getdeck/cli/get.py index 049e8a4..94fa436 100644 --- a/getdeck/cli/get.py +++ b/getdeck/cli/get.py @@ -51,7 +51,11 @@ def run_deck( # noqa: C901 progress_callback(10) # 1.b check or set up local cluster - cluster_created = cluster.start_or_create() + if not ignore_cluster: + logger.info("Cluster already exists, starting it") + cluster_created = cluster.start_or_create() + else: + cluster_created = False if progress_callback: progress_callback(20) @@ -111,13 +115,9 @@ def run_deck( # noqa: C901 if progress_callback: progress_callback(max(50, int(i / total * 50) - 1)) except Exception as e: - logger.error( - "There was an error installing the workload. Now removing the cluster." - ) + logger.error("There was an error installing the workload.") if cluster_created: - # if cluster.kubernetes_cluster_type == ProviderType.BEIBOOT: - # config.kubeconfig = _old_kubeconfig - # config._init_kubeapi() + logger.info("Now removing the cluster.") # remove this just created cluster as it probably is in an inconsistent state from the beginning remove.remove_cluster(deckfile_location, cluster.get_config()) raise e @@ -129,7 +129,7 @@ def run_deck( # noqa: C901 ingress_rules = get_ingress_rules(cluster.get_config(), generated_deck.namespace) if ingress_rules: for host, path in ingress_rules: - logger.info(f"Ingress: {host} -> {path}") + logger.info(f"Ingress: http://{host} -> {path}") handle_hosts_resolution(deckfile_location, data_aux.deckfile, deck_name) logger.info(f"Published ports are: {cluster.get_ports()}") if notes := data_aux.deckfile.get_deck(deck_name).notes: diff --git a/getdeck/cli/remove.py b/getdeck/cli/remove.py index 4821de2..df4da3a 100644 --- a/getdeck/cli/remove.py +++ b/getdeck/cli/remove.py @@ -33,6 +33,9 @@ def remove_cluster( ) if cluster.exists(): + logger.info( + f"Deleting the {cluster.provider_type} cluster with name {cluster.cluster_name}" + ) cluster.delete() else: logger.info("Cluster does not exist") diff --git a/getdeck/fetch/fetch.py b/getdeck/fetch/fetch.py index 79cf368..fac9ab2 100644 --- a/getdeck/fetch/fetch.py +++ b/getdeck/fetch/fetch.py @@ -106,7 +106,7 @@ def fetch_data( # info display_location = location - if display_location == ".": + if display_location in [".", "", None]: display_location = detect_deckfile() logger.info(f"Reading Deckfile: {display_location or '.'}") diff --git a/getdeck/provider/abstract.py b/getdeck/provider/abstract.py index b91d961..503eaa5 100644 --- a/getdeck/provider/abstract.py +++ b/getdeck/provider/abstract.py @@ -31,7 +31,6 @@ def get_config(self): def start_or_create(self) -> bool: if self.exists(): - logger.info("Cluster already exists, starting it") self.start() created = False else: diff --git a/getdeck/provider/beiboot/__init__.py b/getdeck/provider/beiboot/__init__.py index 7dac4ba..33ae89c 100644 --- a/getdeck/provider/beiboot/__init__.py +++ b/getdeck/provider/beiboot/__init__.py @@ -156,7 +156,6 @@ def stop(self) -> bool: raise NotSupportedError(NOT_SUPPORTED_ERROR) def delete(self) -> bool: - logger.info(f"Now deleting Beiboot '{self.cluster_name}'.") api.remove_cluster(cluster_name=self.cluster_name, configuration=self._bbt_conf) return True diff --git a/getdeck/provider/k3d/__init__.py b/getdeck/provider/k3d/__init__.py index de625bd..9c238c9 100644 --- a/getdeck/provider/k3d/__init__.py +++ b/getdeck/provider/k3d/__init__.py @@ -1,4 +1,3 @@ -import logging import sys import subprocess from typing import List, Dict, Optional @@ -7,8 +6,6 @@ from getdeck.provider.types import ProviderType from getdeck.provider.utility_provider import UtilityProvider -logger = logging.getLogger("deck") - class K3d(UtilityProvider): kubernetes_cluster_type = ProviderType.K3D @@ -76,7 +73,6 @@ def stop(self): return True def delete(self): - logger.info(f"Deleting the k3d cluster with name {self.cluster_name}") arguments = ["cluster", "delete", self.cluster_name] self._execute(arguments) return True diff --git a/getdeck/provider/kind/__init__.py b/getdeck/provider/kind/__init__.py index 4b289ca..76108c6 100644 --- a/getdeck/provider/kind/__init__.py +++ b/getdeck/provider/kind/__init__.py @@ -1,4 +1,3 @@ -import logging import sys import subprocess from typing import List, Dict, Optional @@ -8,8 +7,6 @@ from getdeck.provider.utility_provider import UtilityProvider import platform -logger = logging.getLogger("deck") - class Kind(UtilityProvider): kubernetes_cluster_type = ProviderType.KIND @@ -90,7 +87,6 @@ def stop(self): return True def delete(self): - logger.info(f"Deleting the kind cluster with name {self.cluster_name}") arguments = ["delete", "cluster", "--name", self.cluster_name] self._execute(arguments) return True diff --git a/getdeck/provider/kubectl/__init__.py b/getdeck/provider/kubectl/__init__.py index bd1c8ca..66b91fb 100644 --- a/getdeck/provider/kubectl/__init__.py +++ b/getdeck/provider/kubectl/__init__.py @@ -1,4 +1,3 @@ -import logging from typing import List, Optional from semantic_version import Version @@ -8,9 +7,6 @@ from getdeck.provider.types import ProviderType -logger = logging.getLogger("deck") - - class KubectlCtx(AbstractProvider): kubernetes_cluster_type = ProviderType.KUBECTLCTX provider_type = "kubectlctx"