Skip to content

Commit

Permalink
populate Nomad token for task runner update hooks (#16266)
Browse files Browse the repository at this point in the history
The `TaskUpdateRequest` struct we send to task runner update hooks was not
populating the Nomad token that we get from the task runner (which we do for the
Vault token). This results in task runner hooks like the template hook
overwriting the Nomad token with the zero value for the token. This causes
in-place updates of a task to break templates (but not other uses that rely on
identity but don't currently bother to update it, like the identity hook).
  • Loading branch information
tgross authored and philrenaud committed Mar 14, 2023
1 parent 2158676 commit 63f3ac0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/16266.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
template: Fixed a bug where the template runner's Nomad token would be erased by in-place updates to a task
```
1 change: 1 addition & 0 deletions client/allocrunner/taskrunner/task_runner_hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ func (tr *TaskRunner) updateHooks() {

// Build the request
req := interfaces.TaskUpdateRequest{
NomadToken: tr.getNomadToken(),
VaultToken: tr.getVaultToken(),
Alloc: alloc,
TaskEnv: tr.envBuilder.Build(),
Expand Down

0 comments on commit 63f3ac0

Please sign in to comment.