Skip to content

Commit

Permalink
fix: add fixed image and add image to containers
Browse files Browse the repository at this point in the history
  • Loading branch information
JaeAeich committed Aug 21, 2024
1 parent 0cd3110 commit aaad8fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion deployment/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ custom:
# Taskmaster image name
imageName: docker.io/elixircloud/tesk-core-taskmaster
# Taskmaster image version
imageVersion: v0.10.2
imageVersion: fix-null-volumes
# Filer image name
filerImageName: docker.io/elixircloud/tesk-core-filer
# Filer image version
Expand Down
13 changes: 10 additions & 3 deletions tesk/api/kubernetes/convert/converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,7 @@ def from_tes_executor_to_k8s_job( # noqa: PLR0913

# TODO: Not sure what to do with this
# Convert potential TRS URI into docker image
# container.image = self.trs_client.get_docker_image_for_tool_version_uri(
# executor.image
# )
container.image = executor.image

if not container.command:
container.command = []
Expand Down Expand Up @@ -316,6 +314,15 @@ def from_tes_executor_to_k8s_job( # noqa: PLR0913
f"{resources.ram_gb:.6f}Gi"
)

# # Workaround
# # Check if volumes is None and set it to an empty list if it is
# if (
# executor_job.spec
# and executor_job.spec.spec
# and executor_job.spec.spec.volumes is None
# ):
# executor_job.spec.spec.volumes = []

return executor_job

def is_job_in_status(tested_object: V1JobStatus, test_objective: JobStatus) -> bool:
Expand Down

0 comments on commit aaad8fb

Please sign in to comment.