chore: update loki modules for 3.0 release #12433
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: Edward Welch <edward.welch@grafana.com>
chaudum
reviewed
Apr 2, 2024
Comment on lines
23
to
24
| lokiring "github.com/grafana/loki/v3/v3/pkg/util/ring" | ||
| util_ring "github.com/grafana/loki/v3/v3/pkg/util/ring" |
There was a problem hiding this comment.
yup, there were a few of these, fixed them, not sure what happened here with that tool
Signed-off-by: Edward Welch <edward.welch@grafana.com>
updated all protos to use v3 packages as well as import v3 in their deps updated all the integration test files to use v3 imports (missed by the auto tool) fixed a few more v3/v3 errors Signed-off-by: Edward Welch <edward.welch@grafana.com>
Signed-off-by: Edward Welch <edward.welch@grafana.com>
cstyan
approved these changes
Apr 2, 2024
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
Signed-off-by: Edward Welch <edward.welch@grafana.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.
What this PR does / why we need it:
My apologies to anyone with outstanding PR's, but there is no easy way to do this.
This will address the problems we introduced with v2.0 described here when we release 3.0 soon.
This was done using this tool
And this command
mod upgrade -t=3Also manually updated the
pkg/push/go.modfile to have a module:module github.com/grafana/loki/v3/pkg/pushThen updated the go.mod to import the push package at v3
Then manually updated all the protos to have v3 package generation as well as use v3 imports
Update for posterity:
It was incorrect to update the submodule (nested module) in the fashion I did, so this PR #12438 reverts that change.
Currently that submodule is untagged, which is not necessarily a problem but something we can solve separately.
To actually make that tagged 3.0 my understanding is we would need to:
module github.com/grafana/loki/pkg/push/v3pkg/push/v3.0.0(to publish the module)Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)CHANGELOG.mdupdatedadd-to-release-noteslabeldocs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR