Backport dskit, memberlist version updates to k105 to support memberlist cluster labels and verification; re-vendor #6658
Conversation
This file contains 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
…ist cluster labels and verification; re-vendor Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
…label_verification configs Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0%
- distributor -0.3%
+ querier 0%
+ querier/queryrange 0.1%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0%
+ loki 0.6% |
vlad-diachenko
added
the
backport release-2.6.x
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6658-to-release-2.6.x origin/release-2.6.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x d5cc77445842fc7fb83b6e6814a09eac6821a333
# Push it to GitHub
git push --set-upstream origin backport-6658-to-release-2.6.x
git switch main
# Remove the local backport branch
git branch -D backport-6658-to-release-2.6.xThen, create a pull request where the |
vlad-diachenko
pushed a commit
that referenced
this pull request
Jul 15, 2022
…ist cluster labels and verification; re-vendor (#6658) * Backport dskit, memberlist version updates to k105 to support memberlist cluster labels and verification; re-vendor Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * Quick ingester client fix using new weaveworks/middleware package Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * Update memberlist.libsonnet to include new cluster_label and cluster_label_verification configs Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * Lint jsonnet Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
vlad-diachenko
added a commit
that referenced
this pull request
Jul 18, 2022
…o support memberlist cluster labels and verification; re-vendor (#6693) * Backport dskit, memberlist version updates to k105 to support memberlist cluster labels and verification; re-vendor (#6658) * Backport dskit, memberlist version updates to k105 to support memberlist cluster labels and verification; re-vendor Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * Quick ingester client fix using new weaveworks/middleware package Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * Update memberlist.libsonnet to include new cluster_label and cluster_label_verification configs Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * Lint jsonnet Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * manually resolved go.mod conflict * removed redundant mixin changes Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
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.
Signed-off-by: JordanRushing rushing.jordan@gmail.com
What this PR does / why we need it:
This PR backports dependency version bumps for memberlist and dskit that are currently in
main.re:
grafana/dskitandweaveworks/common#6643Which issue(s) this PR fixes:
N/A
Special notes for your reviewer:
N/A
Checklist
CHANGELOG.md.docs/sources/upgrading/_index.md