From 3631b29fe0f1c83b3d4583c01172a00e81c71b92 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 27 Oct 2021 06:20:14 -0700 Subject: [PATCH 1/3] vault: set JobID in Vault metadata --- nomad/vault.go | 1 + 1 file changed, 1 insertion(+) diff --git a/nomad/vault.go b/nomad/vault.go index 3fb4abcde9c..35a27e20ff9 100644 --- a/nomad/vault.go +++ b/nomad/vault.go @@ -997,6 +997,7 @@ func (v *vaultClient) CreateToken(ctx context.Context, a *structs.Allocation, ta Policies: taskVault.Policies, Metadata: map[string]string{ "AllocationID": a.ID, + "JobID": a.JobID, "Task": task, "NodeID": a.NodeID, "Namespace": namespaceForTask, From ce7169394b132b8ccde834ca7a9b9b34a0e6c69c Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 27 Oct 2021 06:56:15 -0700 Subject: [PATCH 2/3] add taskgroup too --- nomad/vault.go | 1 + 1 file changed, 1 insertion(+) diff --git a/nomad/vault.go b/nomad/vault.go index 35a27e20ff9..4e8a1ff1308 100644 --- a/nomad/vault.go +++ b/nomad/vault.go @@ -998,6 +998,7 @@ func (v *vaultClient) CreateToken(ctx context.Context, a *structs.Allocation, ta Metadata: map[string]string{ "AllocationID": a.ID, "JobID": a.JobID, + "TaskGroup": a.TaskGroup, "Task": task, "NodeID": a.NodeID, "Namespace": namespaceForTask, From 2dd5141513408a8f144eebc3975a49c173c16e39 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 27 Oct 2021 06:57:09 -0700 Subject: [PATCH 3/3] changelog --- .changelog/11397.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/11397.txt diff --git a/.changelog/11397.txt b/.changelog/11397.txt new file mode 100644 index 00000000000..892890f2998 --- /dev/null +++ b/.changelog/11397.txt @@ -0,0 +1,3 @@ +```release-note:improvement +vault: Add JobID and TaskGroup to Vault Token metadata +```