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.

Sign up for GitHub

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

Jump to bottom

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

Commits on Jun 13, 2024

  1. delete flux2 chart 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    620ca4f View commit details
    Browse the repository at this point in the history

  2. add flux-operator chart 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    6026836 View commit details
    Browse the repository at this point in the history

  3. redefine fluxcd chart source as flux-operator 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    ba5c7ca View commit details
    Browse the repository at this point in the history

  4. default FluxInstance 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    97e1bda View commit details
    Browse the repository at this point in the history

  5. make flux instance minimal 

    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>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    cb0aea8 View commit details
    Browse the repository at this point in the history

  6. fix versions map (and tag) 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4989e01 View commit details
    Browse the repository at this point in the history

  7. The FluxInstance "flux" is invalid: 

    spec.distribution.registry: Required value
(drat!)

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    0cd7ffc View commit details
    Browse the repository at this point in the history

  8. Revert "fix versions map (and tag)" 

    This reverts commit 4989e01.
    @kingdonb
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    bbd30a3 View commit details
    Browse the repository at this point in the history

  9. take over all components 

    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
    kingdonb committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c955975 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. kubectl wait for fluxinstance/flux 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    890ea9a View commit details
    Browse the repository at this point in the history

  2. try a different wait order 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    8e31c29 View commit details
    Browse the repository at this point in the history

  3. now I see what this is doing 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    cb7c4ea View commit details
    Browse the repository at this point in the history

  4. try to understand how to fix this 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    b7dedd4 View commit details
    Browse the repository at this point in the history

  5. test hostNetwork in chart 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    6670eb8 View commit details
    Browse the repository at this point in the history

  6. add hostNetwork: true value 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    9659702 View commit details
    Browse the repository at this point in the history

  7. test kubeprism with flux-operator 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    b7cb20e View commit details
    Browse the repository at this point in the history

  8. is this a good validation 

    IDK

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    955f630 View commit details
    Browse the repository at this point in the history

  9. better logic order 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    758b069 View commit details
    Browse the repository at this point in the history

  10. set domain in cluster correctly for flux config 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    3f53a5e View commit details
    Browse the repository at this point in the history

  11. set cozy-fluxcd namespace to privileged 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    3860385 View commit details
    Browse the repository at this point in the history

  12. magical operators 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    0e9bdd8 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. test cluster.domain 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    2f75341 View commit details
    Browse the repository at this point in the history

  2. parameterize everything 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    d5af8d6 View commit details
    Browse the repository at this point in the history

  3. remove unsure statements from installer.sh 

    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 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    4e6e1d7 View commit details
    Browse the repository at this point in the history

  4. FluxInstance CRD 

    Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    7790c7c View commit details
    Browse the repository at this point in the history

  5. Resolve deprecated API references 

    HelmRelease is v2 and HelmRepository is v1 now, as of Flux 2.3

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    26ac8db View commit details
    Browse the repository at this point in the history

  6. upgrade Flux to match new helmrelease definitions 

    Helm Controller is GA as of Flux 2.3

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    1da1942 View commit details
    Browse the repository at this point in the history

  7. fluxFaster.yaml - values to speed things up 

    this change was the real motivation for introducing flux-operator

+fixup

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    e51f17b View commit details
    Browse the repository at this point in the history

  8. do not set cluster domain by default 

    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>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    f6876f9 View commit details
    Browse the repository at this point in the history

  9. do not set domain unless it is set in values 

    this caused an error

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
    @kingdonb
    kingdonb committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    c003b7b View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge branch 'upd-flux' into flux-2.3

    @kvaps
    kvaps committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    60941cb View commit details
    Browse the repository at this point in the history