loki: update Cortex to master #1799
Merged
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
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
- Frontend worker now needs to be started explicitly - Lifecycler no longer exits on error. Distributor and Ingester do that now Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
slim-bean
reviewed
Mar 13, 2020
go.mod
Outdated
| @@ -10,7 +10,7 @@ require ( | |||
| github.com/containerd/containerd v1.3.2 // indirect | |||
| github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect | |||
| github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e | |||
| github.com/cortexproject/cortex v0.7.0-rc.0 | |||
| github.com/cortexproject/cortex v0.6.1-0.20200312144321-c105d22e5ad0 | |||
There was a problem hiding this comment.
is this going down a revision because this is current master vs whatever is in 0.7.0rc?
There was a problem hiding this comment.
Go finds latest version tag reachable from commit, and uses that as version number. 0.7* tags are not reachable from master, since release branch wasn't merged to master yet.
There was a problem hiding this comment.
Do we have any guarantees we don't rely on something from 0.7.0-rc.0?
There was a problem hiding this comment.
I've pushed new update that updates this to 0.7.1-* now. It is master, with release-0.7 branch merged in.
slim-bean
reviewed
Mar 13, 2020
slim-bean
approved these changes
Mar 13, 2020
2 tasks
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Codecov Report
@@ Coverage Diff @@
## master #1799 +/- ##
==========================================
- Coverage 64.78% 64.72% -0.07%
==========================================
Files 122 122
Lines 9190 9202 +12
==========================================
+ Hits 5954 5956 +2
- Misses 2823 2832 +9
- Partials 413 414 +1
|
….1-... Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
owen-d
approved these changes
Mar 17, 2020
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.
What this PR does / why we need it: This PR updates Cortex to latest master. There are some changes in Loki code to accommodate for changes in Cortex (specifically, Lifecycler no longer exiting on its own, and frontend worker no longer starting on its own)
Checklist