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

build(flux): update flux to v0.195.1 #25060

Merged
merged 2 commits into from
Jun 13, 2024
Merged

build(flux): update flux to v0.195.1 #25060

merged 2 commits into from
Jun 13, 2024

Conversation

gwossum
Copy link
Member

@gwossum gwossum commented Jun 12, 2024

(cherry picked from commit f4ef091)

  • 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)

Closes: #25058, #25059

gwossum added 2 commits June 12, 2024 17:32
* 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 gwossum added area/flux Issues related to the Flux query engine area/2.x OSS 2.0 related issues and PRs team/edge labels Jun 12, 2024
@gwossum gwossum self-assigned this Jun 12, 2024
@gwossum gwossum requested a review from davidby-influx June 12, 2024 23:04
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

@gwossum gwossum merged commit c6c00b8 into 2.7 Jun 13, 2024
25 checks passed
@gwossum gwossum deleted the gw_flux_update_0.195.1-2.7 branch June 13, 2024 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/flux Issues related to the Flux query engine area/2.x OSS 2.0 related issues and PRs team/edge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants