Skip to content

Upgrade to Flux 2.3.x - #167

Merged
Andrei Kvapil (kvaps) merged 31 commits into
cozystack:upd-fluxfrom
kingdonb:flux-2.3
Jun 17, 2024
Merged

Andrei Kvapil (kvaps) merged 31 commits into
cozystack:upd-fluxfrom
kingdonb:flux-2.3

Conversation

@kingdonb

@kingdonb Kingdon Barrett (kingdonb) commented Jun 13, 2024 •

Copy link
Copy Markdown
Member

With the changes in #166 this was super easy. I don't think there were any errors, and I think the installer would have quit if anything errored out, but I'm going to read the cozystack-installer logs carefully just to be sure we got all the deprecated references. There were some more than I thought of initially.

This PR includes #166 and should probably be rebased again before merging, after that one it can be merged. (Or, alternatively, I guess you could merge both at once.)

Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
we need to conform to the current version in use, 2.2.x, but otherwise
we don't need to specify all of this, and as long as we don't specify
any of this, then user can merge their own configs in with kubectl apply

I hope the FluxInstance registry is set to default to ghcr, so we don't
block anyone from using an enterprise or paid distribution of flux with
this config!

Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
spec.distribution.registry: Required value
(drat!)

Signed-off-by: Kingdon Barrett <[email protected]>
the chart installs by default all 6 components, so make sure we are
taking them all over this way

Signed-off-by: Kingdon Barrett <[email protected]>
@kingdonb

Kingdon Barrett (kingdonb) commented Jun 13, 2024 •

Copy link
Copy Markdown
Member Author

I can definitely clean up the commit history once we're agreed about the content of the PR, let me know if this looks OK.

The diffs unique for this PR are in these commits only: 329d55f and dcf6741 in case that helps reviewers

@kingdonb

Copy link
Copy Markdown
Member Author

You can verify that everything upgraded successfully with flux version -n cozy-fluxcd

Comment thread packages/core/fluxcd/Makefile Outdated
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
IDK

Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
it's tested now, it works, we know where the failures are (and they
aren't a problem for now)

Signed-off-by: Kingdon Barrett <[email protected]>
Signed-off-by: Kingdon Barrett <[email protected]>
HelmRelease is v2 and HelmRepository is v1 now, as of Flux 2.3

Signed-off-by: Kingdon Barrett <[email protected]>
Helm Controller is GA as of Flux 2.3

Signed-off-by: Kingdon Barrett <[email protected]>
this change was the real motivation for introducing flux-operator

+fixup

Signed-off-by: Kingdon Barrett <[email protected]>
@kingdonb

Kingdon Barrett (kingdonb) commented Jun 16, 2024 •

Copy link
Copy Markdown
Member Author

e51f17b is the real motivation for doing all of this, I want to use cozystack in a demo, but Flux should not be the bottleneck 🤣

so users can override it (we should probably provide a way to disable
these customizations as well, so they can provide their own without
getting clobbered by cozystack-installer)

As we know there is no simple way to perform array merges in Helm values

Signed-off-by: Kingdon Barrett <[email protected]>
this caused an error

Signed-off-by: Kingdon Barrett <[email protected]>
@kingdonb

Copy link
Copy Markdown
Member Author

An end-to-end test just now revealed that the Flux 2.3 upgrade requires at least one more update than what I've already done here, in the kubeapps config of the dashboard package:

Screenshot 2024-06-16 at 12 52 04 PM

@kvaps
Andrei Kvapil (kvaps) changed the base branch from main to upd-flux June 17, 2024 13:58
@kvaps
Andrei Kvapil (kvaps) merged commit 931e39f into cozystack:upd-flux Jun 17, 2024
This was referenced Jun 17, 2024
Kingdon Barrett (kingdonb) added a commit to kingdonb/cozystack that referenced this pull request Jun 22, 2024
Signed-off-by: Kingdon Barrett <[email protected]>
Co-authored-by: Andrei Kvapil <[email protected]>
@kingdonb
Kingdon Barrett (kingdonb) deleted the flux-2.3 branch June 24, 2024 13:15
Andrei Kvapil (kvaps) added a commit that referenced this pull request Jun 24, 2024
This cumulative PR includes the following changes:

- Migrate from fluxcd-community charts to Flux-Operator #166
- Upgrade to Flux 2.3.x #167
- Refactor Flux 2.3 update #172
- Update flux plugin for dashboard #171
- Flux Operator 0.6 #178
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.

2 participants