diff --git a/.changelog/9683.txt b/.changelog/9683.txt new file mode 100644 index 0000000000..541f9264c7 --- /dev/null +++ b/.changelog/9683.txt @@ -0,0 +1,3 @@ +```release-notes:improvement +client: when a client agent is attempting to dereigster a service, anddoes not have access to the ACL token used to register a service, attempt to use the agent token instead of the default user token. If no agent token is set, fall back to the default user token. +``` diff --git a/agent/local/state.go b/agent/local/state.go index f6e3961313..d4c2de6464 100644 --- a/agent/local/state.go +++ b/agent/local/state.go @@ -215,7 +215,7 @@ func (l *State) serviceToken(id structs.ServiceID) string { token = s.Token } if token == "" { - token = l.tokens.UserToken() + token = l.tokens.AgentToken() } return token } @@ -428,7 +428,7 @@ func (l *State) checkToken(id structs.CheckID) string { token = c.Token } if token == "" { - token = l.tokens.UserToken() + token = l.tokens.AgentToken() } return token }