Skip to content
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 5 commits into from
Jun 11, 2024
Merged

feat: update flux to latest head #25051

merged 5 commits into from
Jun 11, 2024

Conversation

mhilton
Copy link
Contributor

@mhilton mhilton commented Jun 10, 2024

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.

  • I've read the contributing section of the project README.
  • Signed CLA (if not already signed).

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.
@mhilton mhilton requested a review from a team June 10, 2024 14:22
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.
Copy link
Contributor

@davidby-influx davidby-influx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mhilton mhilton merged commit fd05317 into main-2.x Jun 11, 2024
25 checks passed
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants