backport of commit ab36cf0 (#19027)

Co-authored-by: Luiz Aoqui <[email protected]>
hashicorp · Nov 8, 2023 · f4162ef · f4162ef
1 parent df9dc47
commit f4162ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.changelog/18985.txt b/.changelog/18985.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+vault: Fixed an issue that could cause Nomad to attempt to renew a Vault token that is already expired
+```
diff --git a/client/vaultclient/vaultclient.go b/client/vaultclient/vaultclient.go
@@ -391,6 +391,7 @@ func (c *vaultClient) renew(req *vaultClientRenewalRequest) error {
 	fatal := false
 	if renewalErr != nil &&
 		(strings.Contains(renewalErr.Error(), "lease not found or lease is not renewable") ||
+			strings.Contains(renewalErr.Error(), "invalid lease ID") ||
 			strings.Contains(renewalErr.Error(), "lease is not renewable") ||
 			strings.Contains(renewalErr.Error(), "token not found") ||
 			strings.Contains(renewalErr.Error(), "permission denied")) {