Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make priority class a CLI argument, relocate k8s assets into package data subdirectory #23

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs_execute = "jobs.execute:execute"
[project.optional-dependencies]
dev = ["black", "ruff", "ruff-lsp", "pytest","pre-commit"]

[tool.setuptools.package-data]
"jobs.assets" = ["*.yaml"]

[tool.ruff]
src = ["src"]

Expand Down
File renamed without changes.
6 changes: 6 additions & 0 deletions src/jobs/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ def _make_argparser() -> argparse.ArgumentParser:
help="Kubernetes namespace to create resources in, defaults to currently active namespace",
)

parser.add_argument(
"--priority",
help="Job priority to set when submitting to Kueue (execution mode 'kueue' only).",
)

return parser


Expand All @@ -66,6 +71,7 @@ def submit_job(job: Job) -> None:
runner = KueueRunner(
namespace=args.namespace,
local_queue=args.kueue_local_queue,
priority_class=args.priority,
)
runner.run(job, image)
elif mode == ExecutionMode.RAYCLUSTER:
Expand Down
15 changes: 7 additions & 8 deletions src/jobs/runner/kueue.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def __init__(self, **kwargs: str) -> None:
super().__init__()

self._queue = kwargs.get("local_queue", "user-queue")
self._priority_class = kwargs.get("priority_class", None)

def _make_job_crd(self, job: Job, image: Image, namespace: str) -> client.V1Job:
def _assert_kueue_localqueue(name: str) -> bool:
Expand Down Expand Up @@ -51,11 +52,11 @@ def _assert_kueue_workloadpriorityclass(name: str) -> bool:
raise ValueError(
f"Specified Kueue local queue does not exist: {queue!r}"
)
if pc := sched_opts.priority_class:
if not _assert_kueue_workloadpriorityclass(pc):
raise ValueError(
f"Specified Kueue workload priority class does not exist: {pc!r}"
)
if pc := self._priority_class:
if not _assert_kueue_workloadpriorityclass(pc):
raise ValueError(
f"Specified Kueue workload priority class does not exist: {pc!r}"
)

metadata = client.V1ObjectMeta(
generate_name=sanitize_rfc1123_domain_name(job.name),
Expand All @@ -64,9 +65,7 @@ def _assert_kueue_workloadpriorityclass(name: str) -> bool:
"kueue.x-k8s.io/queue-name": sched_opts.queue_name
if sched_opts and sched_opts.queue_name
else self._queue,
"kueue.x-k8s.io/priority-class": sched_opts.priority_class
if sched_opts
else None,
"kueue.x-k8s.io/priority-class": self._priority_class or None,
}
),
)
Expand Down