ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-03-03 10:42:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken k8s glue docker args parsing

Browse Source 
Fix empty env prevents override when merging template
This commit is contained in:
allegroai 2021-03-26 12:26:15 +03:00
parent 92a1e07b33
commit 9ce6baf074
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clearml_agent/glue/k8s.py
View File

@ -392,16 +392,16 @@ class K8sIntegration(Worker):
def _parse_docker_args(self, docker_args): def _parse_docker_args(self, docker_args):
# type: (list) -> dict # type: (list) -> dict
kube_args = {'env': []} kube_args = []
while docker_args: while docker_args:
cmd = docker_args.pop().strip() cmd = docker_args.pop(0).strip()
if cmd in ('-e', '--env',): if cmd in ('-e', '--env',):
env = docker_args.pop().strip() env = docker_args.pop(0).strip()
key, value = env.split('=', 1) key, value = env.split('=', 1)
kube_args[key] += {key: value} kube_args.append({'name': key, 'value': value})
else: else:
self.log.warning('skipping docker argument {} (only -e --env supported)'.format(cmd)) self.log.warning('skipping docker argument {} (only -e --env supported)'.format(cmd))
return kube_args return {'env': kube_args} if kube_args else {}
def _kubectl_apply(self, create_clearml_conf, docker_image, docker_args, labels, queue, task_id, queue_name): def _kubectl_apply(self, create_clearml_conf, docker_image, docker_args, labels, queue, task_id, queue_name):
template = deepcopy(self.template_dict) template = deepcopy(self.template_dict)