-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
1.17 Manual backport: Current month inconsistencies #28088
1.17 Manual backport: Current month inconsistencies #28088
Conversation
* Simplify handle query to return updated estimation values * Added changelog * remove comment * Revert "Simplify handle query to return updated estimation values" This reverts commit b67969c. * temp * Revert "temp" This reverts commit 4932979. * CE files handle query update * Revert "CE files handle query update" This reverts commit 8dafa2d. * CE Changes * Delete vault/external_tests/upgrade_testing/upgrade_testing_binary/upgrade_test.go
* sort namespaces and mounts before adding them * also sort clients * add comments * pr comment fixes * changelog * changelog update
* Show current month data * Added changelog * Edited changelog
* Docs changes * More condensation of docs * Added some clarity on date ranges * Edited wording' * Added estimation client count info * Update website/content/api-docs/system/internal-counters.mdx Co-authored-by: miagilepner <mia.epner@hashicorp.com> --------- Co-authored-by: miagilepner <mia.epner@hashicorp.com>
@@ -247,21 +231,19 @@ returned by the API for backward compatibility and it may be removed in the futu | |||
`non_entity_clients` field instead. The `non_entity_tokens` field is currently | |||
returned by the API for backward compatibility, and it may be removed in the future. | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was the only conflict in the cherry-picks - the fields aren't deprecated on 1.17, so I kept those deprecation warnings
CI Results: |
Build Results: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Thanks for pointing out the bits that conflicted -- it really helps for reviews like this.
Description
This PR is a manual backport to 1.17 of all of the CE PRs for fixing current month inconsistencies.
TODO only if you're a HashiCorp employee
getting backported to N-2, use the new style
backport/ent/x.x.x+ent
labelsinstead of the old style
backport/x.x.x
labels.the normal
backport/x.x.x
label (there should be only 1).of a public function, even if that change is in a CE file, double check that
applying the patch for this PR to the ENT repo and running tests doesn't
break any tests. Sometimes ENT only tests rely on public functions in CE
files.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.