From 4c9b4ab98deb7e5fbfd8d09601f605ba70bf37e3 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 14 Feb 2025 00:44:58 +0100 Subject: [PATCH] Set default namespace for KSU kustomizations to flux-system Change-Id: I6643b9271f0e389ced44940eeabdf3d25acd3af0 Signed-off-by: garciadeblas --- osm_lcm/k8s.py | 8 ++++---- osm_lcm/odu_libs/ksu.py | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/osm_lcm/k8s.py b/osm_lcm/k8s.py index 4440b5a3..816eb28a 100644 --- a/osm_lcm/k8s.py +++ b/osm_lcm/k8s.py @@ -2117,7 +2117,7 @@ class KsuLcm(GitOpsLcm): oka_list = op_params["oka"] oka_item = oka_list[0] oka_params = oka_item.get("transformation", {}) - target_ns = oka_params.get("namespace", "default") + kustomization_ns = oka_params.get("kustomization_namespace", "flux-system") profile_id = op_params.get("profile", {}).get("_id") profile_type = op_params.get("profile", {}).get("profile_type") self.logger.info( @@ -2136,7 +2136,7 @@ class KsuLcm(GitOpsLcm): { "item": "kustomization", "name": kustomization_name, - "namespace": target_ns, + "namespace": kustomization_ns, "condition": { "jsonpath_filter": "status.conditions[?(@.type=='Ready')].status", "value": "True", @@ -2170,7 +2170,7 @@ class KsuLcm(GitOpsLcm): oka_list = db_ksu["oka"] oka_item = oka_list[0] oka_params = oka_item.get("transformation", {}) - target_ns = oka_params.get("namespace", "default") + kustomization_ns = oka_params.get("kustomization_namespace", "flux-system") profile_id = op_params.get("profile", {}).get("_id") profile_type = op_params.get("profile", {}).get("profile_type") self.logger.info( @@ -2189,7 +2189,7 @@ class KsuLcm(GitOpsLcm): { "item": "kustomization", "name": kustomization_name, - "namespace": target_ns, + "namespace": kustomization_ns, "deleted": True, "timeout": self._checkloop_kustomization_timeout, "enable": True, diff --git a/osm_lcm/odu_libs/ksu.py b/osm_lcm/odu_libs/ksu.py index 59379249..8bd6e25a 100644 --- a/osm_lcm/odu_libs/ksu.py +++ b/osm_lcm/odu_libs/ksu.py @@ -63,6 +63,7 @@ async def create_ksus(self, op_id, op_params_list, content_list): profile_type = MAP_PROFILE[profile_type] profile_name = ksu_params.get("profile", {}).get("name") age_public_key = ksu_params.get("profile", {}).get("age_pubkey") + kustomization_ns = oka_params.get("kustomization_namespace", "flux-system") target_ns = oka_params.get("namespace", "default") substitute_environment = oka_params.get("substitute_environment", "true").lower() custom_env_vars = oka_params.get("custom_env_vars", {}) @@ -70,6 +71,8 @@ async def create_ksus(self, op_id, op_params_list, content_list): custom_env_vars["APPNAME"] = ksu_name if "TARGET_NS" not in custom_env_vars: custom_env_vars["TARGET_NS"] = target_ns + if "KUSTOMIZATION_NS" not in custom_env_vars: + custom_env_vars["KUSTOMIZATION_NS"] = kustomization_ns custom_env_vars_str = "|\n" substitution_filter_list = [] for k, v in custom_env_vars.items(): @@ -211,6 +214,7 @@ async def update_ksus(self, op_id, op_params_list, content_list): profile_type = MAP_PROFILE[profile_type] profile_name = ksu_params.get("profile", {}).get("name") age_public_key = ksu_params.get("profile", {}).get("age_pubkey") + kustomization_ns = oka_params.get("kustomization_namespace", "flux-system") target_ns = oka_params.get("namespace", "default") substitute_environment = oka_params.get("substitute_environment", "true").lower() custom_env_vars = oka_params.get("custom_env_vars", {}) @@ -218,6 +222,8 @@ async def update_ksus(self, op_id, op_params_list, content_list): custom_env_vars["APPNAME"] = ksu_name if "TARGET_NS" not in custom_env_vars: custom_env_vars["TARGET_NS"] = target_ns + if "KUSTOMIZATION_NS" not in custom_env_vars: + custom_env_vars["KUSTOMIZATION_NS"] = kustomization_ns custom_env_vars_str = "|\n" substitution_filter_list = [] for k, v in custom_env_vars.items(): -- 2.25.1