From d96b8ff9068233103053bfe8305fb88274c2c9bf Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Fri, 22 Jul 2022 22:44:32 +0300
Subject: [PATCH] Fix template namespace should override default namespace

---
 clearml_agent/glue/k8s.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/clearml_agent/glue/k8s.py b/clearml_agent/glue/k8s.py
index f177f56..bb7af4c 100644
--- a/clearml_agent/glue/k8s.py
+++ b/clearml_agent/glue/k8s.py
@@ -572,6 +572,12 @@ class K8sIntegration(Worker):
         self, create_clearml_conf, docker_image, docker_args, docker_bash, labels, queue, task_id, template=None
     ):
         template = template or deepcopy(self.template_dict)
+
+        try:
+            namespace = template['metadata']['namespace'] or self.namespace
+        except (KeyError, TypeError, AttributeError):
+            namespace = self.namespace
+
         template.setdefault('apiVersion', 'v1')
         template['kind'] = 'Pod'
         template.setdefault('metadata', {})
@@ -642,7 +648,7 @@ class K8sIntegration(Worker):
             task_id=task_id,
             docker_image=docker_image,
             queue_id=queue,
-            namespace=self.namespace
+            namespace=namespace
         )
         # make sure we provide a list
         if isinstance(kubectl_cmd, str):