From 2f64b9e57f60c75ff503a5ae02f8462efdb6d6da Mon Sep 17 00:00:00 2001 From: Tucker Beck Date: Thu, 16 Jan 2025 14:39:56 -0800 Subject: [PATCH] chore(jobbergate-agent): Set sensible defaults for jobbergate-agent Applied defaults for the `BASE_API_URL` and `OIDC_DOMAIN` to the defaults used for most production deploys of jobbergate-agent. This will make it even simpler to configure the agent for most applications. --- jobbergate-agent/jobbergate_agent/settings.py | 4 ++-- jobbergate-api/jobbergate_api/apps/job_submissions/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jobbergate-agent/jobbergate_agent/settings.py b/jobbergate-agent/jobbergate_agent/settings.py index 463d4e7d2..6bbd2c1b2 100644 --- a/jobbergate-agent/jobbergate_agent/settings.py +++ b/jobbergate-agent/jobbergate_agent/settings.py @@ -31,7 +31,7 @@ class Settings(BaseSettings): DEFAULT_SLURM_WORK_DIR: Path = Path("/tmp") # cluster api info - BASE_API_URL: str = "https://armada-k8s.staging.omnivector.solutions" + BASE_API_URL: str = "https://apis.vantagehpc.io" # Sentry SENTRY_DSN: Optional[AnyHttpUrl] = None @@ -41,7 +41,7 @@ class Settings(BaseSettings): SENTRY_PROFILING_SAMPLE_RATE: Annotated[float, confloat(gt=0.0, le=1.0)] = 0.01 # OIDC config for machine-to-machine security - OIDC_DOMAIN: str + OIDC_DOMAIN: str = "auth.vantagehpc.io/realms/vantage" OIDC_CLIENT_ID: str OIDC_CLIENT_SECRET: str OIDC_USE_HTTPS: bool = True diff --git a/jobbergate-api/jobbergate_api/apps/job_submissions/models.py b/jobbergate-api/jobbergate_api/apps/job_submissions/models.py index 209ebe4ac..bf5605f66 100644 --- a/jobbergate-api/jobbergate_api/apps/job_submissions/models.py +++ b/jobbergate-api/jobbergate_api/apps/job_submissions/models.py @@ -28,7 +28,7 @@ class JobSubmission(CrudMixin, Base): slurm_job_id: The id of the job in the slurm queue. slurm_job_state: The Slurm Job state as reported by the agent slurm_job_info: Detailed information about the Slurm Job as reported by the agent - client_id: The id of the custer this submission runs on. + client_id: The id of the cluster this submission runs on. status: The status of the job submission. report_message: The message returned by the job. sbatch_arguments: The arguments used to submit the job to the slurm queue.