-
Notifications
You must be signed in to change notification settings - Fork 7
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
Upgrade to v1.14.1 #36
Conversation
2fb1dc3
to
a655dfa
Compare
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
a655dfa
to
cc1a7ce
Compare
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
@@ -3,11 +3,11 @@ module github.com/cortexproject/cortex-tools | |||
go 1.22.2 | |||
|
|||
require ( | |||
cloud.google.com/go/storage v1.10.0 |
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 version has been retracted due to googleapis/google-cloud-go#6857. Let's use a newer version that fixes the bug, e.g. v1.28.0
?
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.
it's the version used by cortex v1.14.1 https://github.com/cortexproject/cortex/blob/v1.14.1/go.mod#L78
will not touch this
// Use fork of gocql that has gokit logs and Prometheus metrics. | ||
replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 | ||
|
||
// Using a 3rd-party branch for custom dialer - see https://github.com/bradfitz/gomemcache/pull/86 | ||
replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab | ||
|
||
// Required for Alertmanager | ||
// Replace memberlist with Grafana's fork which includes some fixes that haven't been merged upstream yet | ||
replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.2.5-0.20211201083710-c7bc8e9df94b |
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.
I don't think this is needed here.
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.
we are better using the same version cortex uses
cortex-tools/pkg/bench/ring_check.go
Line 14 in f2909a3
"github.com/cortexproject/cortex/pkg/ring/kv/memberlist" |
I am just trying to build according to https://github.com/cortexproject/cortex/blob/v1.14.1/go.mod#L216-L241 |
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
yeah, no
that is because of the grpc upgrade. I will revert |
This reverts commit a57d5ff. Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
* Update to cortex v1.14.1 Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * max-samples-per-query got removed after chunks removal Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * Apply some of the suggestions Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * Revert "Apply some of the suggestions" This reverts commit a57d5ff. Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> --------- Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
No description provided.