Upgrade cortex to 1.6 and other dependencies.#442
Merged
joe-elliott merged 8 commits intografana:masterfrom Jan 19, 2021
Merged
Upgrade cortex to 1.6 and other dependencies.#442joe-elliott merged 8 commits intografana:masterfrom
joe-elliott merged 8 commits intografana:masterfrom
Conversation
annanay25
reviewed
Jan 8, 2021
Contributor
annanay25
left a comment
annanay25
left a comment
There was a problem hiding this comment.
Mostly looking good, left a few comments.
…lve conflict between cortex 1.6 and otel collect 0.6.1
mdisibio
changed the title
annanay25
reviewed
Jan 19, 2021
Contributor
annanay25
left a comment
annanay25
left a comment
There was a problem hiding this comment.
Nice work! Left a final few comments.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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:
This PR upgrades cortex to 1.6 in order to bring in an important fix: cortexproject/cortex#3603 There is a conflict between cortex v1.6.0 and open-telemetry-collector v0.6.1 on the prometheus/prometheus reference. It was addressed by committing a local copy of prometheus/prometheus/discovery/config module in the vendor-fix folder and replace directive was added to go.mod. This fix can be removed when the open-telemetry collector reference is updated.
Which issue(s) this PR fixes:
n/a
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]