From 121a343d0679d2e3d832496c468e7cb33ef424e0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 8 Jul 2025 10:44:07 +0200 Subject: [PATCH] Add fleet and sw-catalogs repo URLs to GitopsConfig to properly load them from env Change-Id: Ia2d204bb1a3460c460fe660f4dfe2cca426d164f Signed-off-by: garciadeblas --- osm_lcm/data_utils/lcm_config.py | 2 ++ osm_lcm/odu_workflows.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/osm_lcm/data_utils/lcm_config.py b/osm_lcm/data_utils/lcm_config.py index 224b4a48..ac668080 100644 --- a/osm_lcm/data_utils/lcm_config.py +++ b/osm_lcm/data_utils/lcm_config.py @@ -208,6 +208,8 @@ class MonitoringConfig(OsmConfigman): class GitopsConfig(OsmConfigman): git_base_url: str = None + fleet_repo_url: str = None + sw_catalogs_repo_url: str = None user: str = None pubkey: str = None mgmtcluster_kubeconfig: str = None diff --git a/osm_lcm/odu_workflows.py b/osm_lcm/odu_workflows.py index 4676ccb2..ccaaf33a 100644 --- a/osm_lcm/odu_workflows.py +++ b/osm_lcm/odu_workflows.py @@ -51,10 +51,10 @@ class OduWorkflow(LcmBase): self.gitops_config = config["gitops"] self.logger.debug(f"Config: {self.gitops_config}") self._odu_checkloop_retry_time = 15 - self._kubeconfig = self.gitops_config["mgmtcluster_kubeconfig"] + self._kubeconfig = self.gitops_config.get("mgmtcluster_kubeconfig") self._kubectl = kubectl.Kubectl(config_file=self._kubeconfig) - self._repo_base_url = self.gitops_config["git_base_url"] - self._repo_user = self.gitops_config["user"] + self._repo_base_url = self.gitops_config.get("git_base_url") + self._repo_user = self.gitops_config.get("user") self._repo_fleet_url = self.gitops_config.get( "fleet_repo_url", f"{self._repo_base_url}/{self._repo_user}/fleet-osm.git" ) -- 2.25.1