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

Upgrade to Flux 2.3.x #167

Merged
merged 31 commits into from
Jun 17, 2024
Merged

Upgrade to Flux 2.3.x #167

merged 31 commits into from
Jun 17, 2024

Conversation

kingdonb
Copy link
Contributor

@kingdonb kingdonb commented Jun 13, 2024

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

kingdonb added 9 commits June 12, 2024 20:59
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
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 <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
spec.distribution.registry: Required value
(drat!)

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
the chart installs by default all 6 components, so make sure we are
taking them all over this way

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
@kingdonb
Copy link
Contributor Author

kingdonb commented Jun 13, 2024

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
Contributor Author

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

kingdonb added 15 commits June 15, 2024 12:43
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
IDK

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
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 <kingdon+github@tuesdaystudios.com>
@kingdonb kingdonb force-pushed the flux-2.3 branch 2 times, most recently from af6d7ae to 2154617 Compare June 16, 2024 02:49
kingdonb added 4 commits June 15, 2024 23:26
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
HelmRelease is v2 and HelmRepository is v1 now, as of Flux 2.3

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Helm Controller is GA as of Flux 2.3

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
this change was the real motivation for introducing flux-operator

+fixup

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
@kingdonb
Copy link
Contributor Author

kingdonb commented Jun 16, 2024

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 🤣

kingdonb added 2 commits June 16, 2024 10:55
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 <kingdon+github@tuesdaystudios.com>
this caused an error

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
@kingdonb
Copy link
Contributor 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 kvaps changed the base branch from main to upd-flux June 17, 2024 13:58
@kvaps kvaps merged commit 931e39f into aenix-io:upd-flux Jun 17, 2024
This was referenced Jun 17, 2024
kingdonb added a commit to kingdonb/cozystack that referenced this pull request Jun 22, 2024
Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
Co-authored-by: Andrei Kvapil <kvapss@gmail.com>
@kingdonb kingdonb deleted the flux-2.3 branch June 24, 2024 13:15
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