From ed028f01894b4f0cf9d939bac3949d766fcdc29c Mon Sep 17 00:00:00 2001 From: Phil Renaud Date: Wed, 26 Jun 2024 13:50:49 -0400 Subject: [PATCH] Simplify job.IsPack declaration --- .changelog/23404.txt | 3 +++ nomad/job_endpoint_statuses.go | 14 ++------------ ui/app/routes/jobs/job.js | 1 - 3 files changed, 5 insertions(+), 13 deletions(-) create mode 100644 .changelog/23404.txt diff --git a/.changelog/23404.txt b/.changelog/23404.txt new file mode 100644 index 00000000000..38a15c77521 --- /dev/null +++ b/.changelog/23404.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: added a Pack badge to the jobs index page for jobs run via Nomad Pack +``` diff --git a/nomad/job_endpoint_statuses.go b/nomad/job_endpoint_statuses.go index e2a3c9f967c..c02768fe15b 100644 --- a/nomad/job_endpoint_statuses.go +++ b/nomad/job_endpoint_statuses.go @@ -6,7 +6,6 @@ package nomad import ( "errors" "net/http" - "strings" "time" "github.com/armon/go-metrics" @@ -199,16 +198,6 @@ func (j *Job) Statuses( func jobStatusesJobFromJob(ws memdb.WatchSet, store *state.StateStore, job *structs.Job) (structs.JobStatusesJob, uint64, error) { highestIdx := job.ModifyIndex - isPack := false - if job.Meta != nil { - for key, value := range job.Meta { - if strings.HasPrefix(key, "pack") && value != "" { - isPack = true - break - } - } - } - jsj := structs.JobStatusesJob{ NamespacedID: structs.NamespacedID{ ID: job.ID, @@ -230,9 +219,10 @@ func jobStatusesJobFromJob(ws memdb.WatchSet, store *state.StateStore, job *stru LatestDeployment: nil, Stop: job.Stop, Status: job.Status, - IsPack: isPack, } + _, jsj.IsPack = job.Meta["pack.name"] + // the GroupCountSum will map to how many allocations we expect to run // (for service jobs) for _, tg := range job.TaskGroups { diff --git a/ui/app/routes/jobs/job.js b/ui/app/routes/jobs/job.js index 59656ef3a9d..deb5949d934 100644 --- a/ui/app/routes/jobs/job.js +++ b/ui/app/routes/jobs/job.js @@ -44,7 +44,6 @@ export default class JobRoute extends Route.extend(WithWatchers) { const relatedModelsQueries = [ job.get('allocations'), job.get('evaluations'), - // this.store.query('job', { namespace, meta: true }), // TODO: I think I am probably nuking the ability to get meta:pack info here. See https://github.com/hashicorp/nomad/pull/14833 this.store.findAll('namespace'), ];