From 1afd91405148a7125cf09e72eea595b4eebad5de Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Thu, 30 Jan 2025 15:10:31 -0600 Subject: [PATCH] Pythonic error handling --- src/manifests_base.py | 8 +------- src/manifests_cephfs.py | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/manifests_base.py b/src/manifests_base.py index bf5468a..19a12f3 100644 --- a/src/manifests_base.py +++ b/src/manifests_base.py @@ -91,13 +91,6 @@ def filter_containers(self, containers: list) -> Generator: yield container -def update_storage_params(ceph_type: str, config: Dict[str, Any], params: Dict[str, str]) -> None: - """Adjust parameters for storage class.""" - cfg_name = f"{ceph_type}-storage-class-parameters" - if not (adjustments := config.get(cfg_name)): - log.info(f"No adjustments for {ceph_type} storage-class parameters") - return - class CephToleration(Toleration): @classmethod def _from_string(cls, toleration_str: str) -> "CephToleration": @@ -138,6 +131,7 @@ def from_space_separated(cls, tolerations: str) -> List["CephToleration"]: except ValueError as e: raise ValueError(f"Invalid tolerations: {e}") from e + def update_storage_params(ceph_type: str, config: Dict[str, Any], params: Dict[str, str]) -> None: """Adjust parameters for storage class.""" cfg_name = f"{ceph_type}-storage-class-parameters" diff --git a/src/manifests_cephfs.py b/src/manifests_cephfs.py index ad50da6..0c56626 100644 --- a/src/manifests_cephfs.py +++ b/src/manifests_cephfs.py @@ -179,6 +179,7 @@ def __call__(self) -> List[AnyResource]: class ProvisionerAdjustments(Patch): """Update Cephfs provisioner.""" + PROVISIONER_NAME = "csi-cephfsplugin-provisioner" PLUGIN_NAME = "csi-cephfsplugin"