-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
feat: update flux to latest head #25051
Merged
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
Flux has updated some dependencies, including prometheus. Prometheus has changed in some incompatible ways. Update the flux dependency to a newer version with the updated prometheus dependency and apply some small fixes to make everything build. This is in preparation for a flux release later in the week. The biggest change is in some tests that were using runtime.DeepEqual to check the correctness of prometheus metrics. The internals of these types have changed such that this is not a safe thing to do anymore. The test now verifies the string representations, as produced by String(), match.
4075181
to
2c42c8a
Compare
c51c959
to
ddbcf66
Compare
The scripts/ci/check-system-go-matches-go-mod.sh is failing because newer go toolchains include the bugfix version in go.mod's go directive. Update the script to check the major and minor versions reported by both tools match.
ddbcf66
to
9db62cc
Compare
davidby-influx
approved these changes
Jun 10, 2024
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.
LGTM
gwossum
added a commit
that referenced
this pull request
Jun 12, 2024
* feat: update flux to latest head Flux has updated some dependencies, including prometheus. Prometheus has changed in some incompatible ways. Update the flux dependency to a newer version with the updated prometheus dependency and apply some small fixes to make everything build. This is in preparation for a flux release later in the week. The biggest change is in some tests that were using runtime.DeepEqual to check the correctness of prometheus metrics. The internals of these types have changed such that this is not a safe thing to do anymore. The test now verifies the string representations, as produced by String(), match. * fix: update CI script The scripts/ci/check-system-go-matches-go-mod.sh is failing because newer go toolchains include the bugfix version in go.mod's go directive. Update the script to check the major and minor versions reported by both tools match. (cherry picked from commit fd05317)
gwossum
added a commit
that referenced
this pull request
Jun 13, 2024
* feat: update flux to latest head (#25051) * feat: update flux to latest head Flux has updated some dependencies, including prometheus. Prometheus has changed in some incompatible ways. Update the flux dependency to a newer version with the updated prometheus dependency and apply some small fixes to make everything build. This is in preparation for a flux release later in the week. The biggest change is in some tests that were using runtime.DeepEqual to check the correctness of prometheus metrics. The internals of these types have changed such that this is not a safe thing to do anymore. The test now verifies the string representations, as produced by String(), match. * fix: update CI script The scripts/ci/check-system-go-matches-go-mod.sh is failing because newer go toolchains include the bugfix version in go.mod's go directive. Update the script to check the major and minor versions reported by both tools match. (cherry picked from commit fd05317) * build(flux): update flux to v0.195.1 (#25052) (cherry picked from commit f4ef091)
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.
Flux has updated some dependencies, including prometheus. Prometheus has changed in some incompatible ways. Update the flux dependency to a newer version with the updated prometheus dependency and apply some small fixes to make everything build. This is in preparation for a flux release later in the week.
The biggest change is in some tests that were using runtime.DeepEqual to check the correctness of prometheus metrics. The internals of these types have changed such that this is not a safe thing to do anymore. The test now verifies the string representations, as produced by String(), match.
Closes #
Describe your proposed changes here.