Skip to content

Update flux-operator to 0.22.0, Flux to 2.6.x - #1035

Merged
Andrei Kvapil (kvaps) merged 2 commits into
cozystack:mainfrom
kingdonb:update-flux-operator
Jun 9, 2025
Merged

Andrei Kvapil (kvaps) merged 2 commits into
cozystack:mainfrom
kingdonb:update-flux-operator

Conversation

@kingdonb

@kingdonb Kingdon Barrett (kingdonb) commented Jun 6, 2025 •

Copy link
Copy Markdown
Member

Flux 2.6.1 is the latest Flux release now

Summary by CodeRabbit

  • New Features

    • Enhanced validation for custom resources to ensure consistent naming and conditional field requirements.
    • Added support for referencing input providers using label selectors, and expanded input provider types.
    • Extended reporting with new cluster information fields.
  • Bug Fixes

    • Improved schema constraints to prevent invalid or inconsistent resource configurations.
  • Documentation

    • Updated version information in documentation and Helm chart metadata to reflect the latest release.

@coderabbitai

coderabbitai Bot commented Jun 6, 2025 •

Copy link
Copy Markdown
Contributor

Walkthrough

This update increases the version numbers for both the Flux Operator and flux-instance Helm charts from 0.20.0 to 0.22.0. It also introduces stricter validation rules and schema enhancements for several CustomResourceDefinitions (CRDs) in the FluxCD operator, improving resource validation and flexibility in referencing input providers.

Changes

Files Change Summary
.../fluxcd-operator/charts/flux-operator/Chart.yaml Bumped chart and appVersion from 0.20.0 to 0.22.0.
.../fluxcd-operator/charts/flux-operator/README.md Updated version badges from 0.20.0 to 0.22.0.
.../fluxcd-operator/charts/flux-operator/templates/crds.yaml Added validation rules and schema enhancements to CRDs: stricter naming, new fields, conditional validation, label selectors.
.../fluxcd/charts/flux-instance/Chart.yaml Bumped chart and appVersion from 0.20.0 to 0.22.0.
.../fluxcd/charts/flux-instance/README.md Updated version badges from 0.20.0 to 0.22.0.
.../fluxcd/values.yaml Updated FluxCD distribution version from "2.5.x" to "2.6.x".

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Helm
    participant Kubernetes API
    participant CRD Validator

    User->>Helm: Install/Upgrade flux-operator chart (v0.22.0)
    Helm->>Kubernetes API: Apply CRDs with enhanced schemas
    Kubernetes API->>CRD Validator: Validate CRD objects on creation/update
    CRD Validator-->>Kubernetes API: Enforce new rules (name, fields, selectors)
    Kubernetes API-->>User: Accept or reject resources based on validation
Loading

Possibly related PRs

  • cozystack/cozystack#631: Also updates the flux-operator Helm chart version and modifies CRDs and RBAC features.
  • cozystack/cozystack#934: Updates the same chart from 0.19.0 to 0.20.0, related by versioning but not by schema changes.
  • cozystack/cozystack#640: Updates FluxCD version in values.yaml from 2.4.x to 2.5.x, related to version bumps in FluxCD distribution.

Suggested labels

documentation, enhancement, size:M, lgtm

Suggested reviewers

  • lllamnyp
  • klinch0
  • kvaps

Poem

Hopping along the version trail,
CRDs now stricter, less chance to fail.
Badges shine with numbers new,
Label selectors join the crew.
From 0.20 to 0.22 we leap,
Validation rules now run deep—
A happy bunny, code to keep! 🐇✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 7af97e2 and d2bb66d.

📒 Files selected for processing (1)
  • packages/system/fluxcd/values.yaml (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • packages/system/fluxcd/values.yaml

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml (1)

918-928: Introduce static provider and optional URL.
Adding Static to the type enum and relaxing the url pattern to allow empty strings enables static input providers.

Consider simplifying the regex to ^(https?://.*)?$ for readability.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 4779db2 and 7af97e2.

📒 Files selected for processing (5)
  • packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml (2 hunks)
  • packages/system/fluxcd-operator/charts/flux-operator/README.md (1 hunks)
  • packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml (6 hunks)
  • packages/system/fluxcd/charts/flux-instance/Chart.yaml (2 hunks)
  • packages/system/fluxcd/charts/flux-instance/README.md (1 hunks)
🔇 Additional comments (11)
packages/system/fluxcd/charts/flux-instance/README.md (1)

3-3: Version bump is consistent with Chart.yaml.
The Version and AppVersion badges have been updated to 0.22.0, aligning with the chart metadata.

packages/system/fluxcd-operator/charts/flux-operator/README.md (1)

3-3: Version bump is consistent with chart metadata.
The Version and AppVersion badges have been updated to 0.22.0, aligning with Chart.yaml.

packages/system/fluxcd/charts/flux-instance/Chart.yaml (2)

11-11: Update appVersion to v0.22.0.
Matches the latest Flux 2.6.1 release and aligns with flux-operator version bump.


28-28: Bump chart version to 0.22.0.
This matches the appVersion update and ensures coherent releases.

packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml (2)

11-11: Update appVersion to v0.22.0.
Aligns with the upstream Flux 2.6.1 release.


28-28: Bump chart version to 0.22.0.
Ensures the Helm chart version aligns with appVersion.

packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml (5)

487-490: Enforce single FluxInstance naming.
The x-kubernetes-validations rule ensures that FluxInstance resources must be named "flux", preventing duplicate instances.


559-574: Add cluster metadata to FluxReport spec.
Including node count, platform, and serverVersion enriches the report with cluster context. Ensure clients consuming the CRD handle the optional cluster block.


770-773: Enforce single FluxReport naming.
The x-kubernetes-validations rule restricts FluxReport resources to the name "flux", aligning with FluxInstance naming conventions.


933-938: Validate URL presence based on provider type.
The dual x-kubernetes-validations ensure url is empty for Static providers and required otherwise.


1166-1182: Enhance inputsFrom schema for flexible referencing.
Allowing either name or selector with atomic map type and enforcing mutual exclusivity improves input provider references.

Also applies to: 1221-1228

Signed-off-by: Kingdon B <[email protected]>
@kingdonb Kingdon Barrett (kingdonb) changed the title Update flux-operator to 0.22.0 Update flux-operator to 0.22.0, Flux to 2.6.x Jun 8, 2025

@kvaps Andrei Kvapil (kvaps) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@kvaps
Andrei Kvapil (kvaps) merged commit c467ed7 into cozystack:main Jun 9, 2025
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