ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-04-25 16:39:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix k8s glue does not pass docker environment variables

Browse Source 
Remove deprecated flags
This commit is contained in:
allegroai 2021-03-03 15:07:06 +02:00
parent 9dfa1294e2
commit 205f9dd816
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clearml_agent/glue/k8s.py
View File

@ -36,8 +36,7 @@ class K8sIntegration(Worker):
KUBECTL_RUN_CMD = "kubectl run clearml-{queue_name}-id-{task_id} " \ KUBECTL_RUN_CMD = "kubectl run clearml-{queue_name}-id-{task_id} " \
"--image {docker_image} " \ "--image {docker_image} " \
"--restart=Never --replicas=1 " \ "--restart=Never " \
"--generator=run-pod/v1 " \
"--namespace={namespace}" "--namespace={namespace}"
KUBECTL_DELETE_CMD = "kubectl delete pods " \ KUBECTL_DELETE_CMD = "kubectl delete pods " \
@ -273,13 +272,13 @@ class K8sIntegration(Worker):
return return
if task_data.execution.docker_cmd: if task_data.execution.docker_cmd:
docker_parts = task_data.execution.docker_cmd docker_cmd = task_data.execution.docker_cmd
else: else:
docker_parts = str(ENV_DOCKER_IMAGE.get() or docker_cmd = str(ENV_DOCKER_IMAGE.get() or
self._session.config.get("agent.default_docker.image", "nvidia/cuda")) self._session.config.get("agent.default_docker.image", "nvidia/cuda"))
# take the first part, this is the docker image name (not arguments) # take the first part, this is the docker image name (not arguments)
docker_parts = docker_parts.split() docker_parts = docker_cmd.split()
docker_image = docker_parts[0] docker_image = docker_parts[0]
docker_args = docker_parts[1:] if len(docker_parts) > 1 else [] docker_args = docker_parts[1:] if len(docker_parts) > 1 else []
@ -355,7 +354,7 @@ class K8sIntegration(Worker):
else: else:
output, error = self._kubectl_run( output, error = self._kubectl_run(
create_clearml_conf=create_clearml_conf, create_clearml_conf=create_clearml_conf,
labels=labels, docker_image=docker_image, labels=labels, docker_image=docker_cmd,
task_data=task_data, task_data=task_data,
task_id=task_id, queue=queue, queue_name=safe_queue_name) task_id=task_id, queue=queue, queue_name=safe_queue_name)