Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

agent/token: rename agent_master to agent_recovery (internally) #11744

Merged
merged 4 commits into from
Dec 7, 2021

Conversation

boxofrad
Copy link
Contributor

@boxofrad boxofrad commented Dec 6, 2021

Following the external-facing renaming of the agent_master ACL token to agent_recovery (in #11665 and #11669) this PR is the first of a series to fix internal references to the old name, starting with the agent/token package.

It's worth noting that this changes the name of the field in the on-disk token persistence file (see: a876f52) but maintains support for reading files created by earlier versions of Consul, with the previous name.

@boxofrad boxofrad changed the title agent/token: rename agent_master to agent_recovery agent/token: rename agent_master to agent_recovery (internally) Dec 6, 2021
@github-actions github-actions bot added the theme/config Relating to Consul Agent configuration, including reloading label Dec 6, 2021
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging December 6, 2021 12:52 Inactive
@vercel vercel bot temporarily deployed to Preview – consul December 6, 2021 12:52 Inactive
Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Nice handling of the existing persisted agent tokens!

@boxofrad boxofrad merged commit 3a91815 into main Dec 7, 2021
@boxofrad boxofrad deleted the boxofrad/rename-agent-master-token-persistence branch December 7, 2021 12:12
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/519650.

@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/521337.

@hc-github-team-consul-core
Copy link
Collaborator

🍒✅ Cherry pick of commit 3a91815 onto release/1.11.x succeeded!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/config Relating to Consul Agent configuration, including reloading
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants