Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Update Flux dependency to 1.25.4 #661

Merged
merged 4 commits into from
Aug 31, 2022
Merged

Update Flux dependency to 1.25.4 #661

merged 4 commits into from
Aug 31, 2022

Conversation

kingdonb
Copy link
Member

Looking to see if we can easily land this update here:

(Let's run the CI and see how this change goes, something tells me there's a reason that Flux here is still pinned to 1.18...)

Kingdon Barrett added 2 commits August 30, 2022 14:06
Signed-off-by: Kingdon Barrett <kingdon@weave.works>
the CommitsBetween method added a firstParent boolean here, in:

fluxcd/flux@42d6f18

fluxcd/flux#2803

If we are calling CommitsBetween here, expecting the old behavior, then
it should be set to "false"

Signed-off-by: Kingdon Barrett <kingdon@weave.works>
@kingdonb
Copy link
Member Author

This passed the tests, so I'll try it out locally some time this week, and then we can publish a version of Helm Operator with the same stance on default telemetry. 👍

There should be no code changes required to get the new checkpoint code from fluxcd/flux/pkg/checkpoint, just to point at the newer version of Flux as a dependency.

I have not tested this at all outside of the CI scaffolding.

@kingdonb kingdonb marked this pull request as ready for review August 30, 2022 20:18
@pjbgf
Copy link
Member

pjbgf commented Aug 31, 2022

@kingdonb we need a replace to update github.com/containerd/containerd to v1.5.13 to fix CVE-2022-31030.
And another for github.com/prometheus/client_golang to v1.12.2 for CVE-2022-21698.

Kingdon Barrett added 2 commits August 31, 2022 13:13
#661 (comment)

Signed-off-by: Kingdon Barrett <kingdon@weave.works>
Signed-off-by: Kingdon Barrett <kingdon@weave.works>
Copy link
Member

@pjbgf pjbgf left a comment

Choose a reason for hiding this comment

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

LGTM

@pjbgf pjbgf merged commit f6b3e16 into master Aug 31, 2022
@pjbgf pjbgf deleted the update-deps branch August 31, 2022 21:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants