Backport of Improve ux around ACL token to help users avoid overwriting node/service identities into release/1.15.x#16541
Merged
hc-github-team-consul-core merged 8 commits intorelease/1.15.xfrom Mar 6, 2023
Conversation
a3aac81 to
41ba8e8
Compare
bbf2bfc to
b68737d
Compare
github-team-consul-core-pr-approver
approved these changes
Mar 6, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #16506 to be assessed for backporting due to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
Description
Follow up to #16288
TLDR:
node-identityandservice-identityflags when specified without themerge-*flags overwrites service identities and node identities of a token. This is ambiguous to the user because we have ano-mergeflag which seems to imply that on update we are merging. So we have been doing work to improve the ux by renaming/adding/sunsetting flags and adding more docs to help reduce the ambiguitymerge-node-identitiesandmerge-service-identitiesfor deprecation and encouraging the use of their replacementappend-node-policyandappend-service-identity-rulesoverwrites existing rulesappend-node-policyandappend-service-identityPR Checklist
Overview of commits