vrr/cozystack
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Fluxcd 2.7.x, enable source-watcher

Browse source 
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
This commit is contained in:
Andrei Kvapil 2025-11-18 19:56:27 +01:00
parent e5b65e8e77
commit 2a87c83043
No known key found for this signature in database
GPG key ID: 931CF7FEACEAF765
7 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml
View file

@ -8,7 +8,7 @@ annotations:
- name: Upstream Project
url: https://github.com/controlplaneio-fluxcd/flux-operator
apiVersion: v2
appVersion: v0.30.0
appVersion: v0.33.0
description: 'A Helm chart for deploying the Flux Operator. '
home: https://github.com/controlplaneio-fluxcd
icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
@ -25,4 +25,4 @@ sources:
- https://github.com/controlplaneio-fluxcd/flux-operator
- https://github.com/controlplaneio-fluxcd/charts
type: application
version: 0.30.0
version: 0.33.0

2
packages/system/fluxcd-operator/charts/flux-operator/README.md
View file

@ -1,6 +1,6 @@
# flux-operator
![Version: 0.30.0](https://img.shields.io/badge/Version-0.30.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.30.0](https://img.shields.io/badge/AppVersion-v0.30.0-informational?style=flat-square)
![Version: 0.33.0](https://img.shields.io/badge/Version-0.33.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.33.0](https://img.shields.io/badge/AppVersion-v0.33.0-informational?style=flat-square)
The [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator) provides a
declarative API for the installation and upgrade of CNCF [Flux](https://fluxcd.io) and the

15
packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml
View file

@ -203,6 +203,15 @@ spec:
Registry address to pull the distribution images from
e.g. 'ghcr.io/fluxcd'.
type: string
variant:
description: |-
Variant specifies the Flux distribution flavor stored
in the registry.
enum:
- upstream-alpine
- enterprise-alpine
- enterprise-distroless
type: string
version:
description: Version semver expression e.g. '2.x', '2.3.x'.
type: string
@ -583,6 +592,12 @@ spec:
LastAttemptedRevision is the version and digest of the
distribution config that was last attempted to reconcile.
type: string
lastHandledForceAt:
description: |-
LastHandledForceAt holds the value of the most recent
force request value, so a change of the annotation value
can be detected.
type: string
lastHandledReconcileAt:
description: |-
LastHandledReconcileAt holds the value of the most recent

3
packages/system/fluxcd-operator/charts/flux-operator/templates/network-policy.yaml → packages/system/fluxcd-operator/packages/system/fluxcd-operator/charts/flux-operator/templates/network-policy.yaml
View file

@ -1,5 +1,4 @@
{{- if .Capabilities.APIVersions.Has "cilium.io/v2/CiliumClusterwideNetworkPolicy" }}
---
apiVersion: cilium.io/v2
kind: CiliumClusterwideNetworkPolicy
metadata:
@ -17,5 +16,3 @@ spec:
protocol: TCP
ingress:
- fromEntities:
- cluster
{{- end }}

4
packages/system/fluxcd/charts/flux-instance/Chart.yaml
View file

@ -8,7 +8,7 @@ annotations:
- name: Upstream Project
url: https://github.com/controlplaneio-fluxcd/flux-operator
apiVersion: v2
appVersion: v0.30.0
appVersion: v0.33.0
description: 'A Helm chart for deploying a Flux instance managed by Flux Operator. '
home: https://github.com/controlplaneio-fluxcd
icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
@ -25,4 +25,4 @@ sources:
- https://github.com/controlplaneio-fluxcd/flux-operator
- https://github.com/controlplaneio-fluxcd/charts
type: application
version: 0.30.0
version: 0.33.0

2
packages/system/fluxcd/charts/flux-instance/README.md
View file

@ -1,6 +1,6 @@
# flux-instance
![Version: 0.30.0](https://img.shields.io/badge/Version-0.30.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.30.0](https://img.shields.io/badge/AppVersion-v0.30.0-informational?style=flat-square)
![Version: 0.33.0](https://img.shields.io/badge/Version-0.33.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.33.0](https://img.shields.io/badge/AppVersion-v0.33.0-informational?style=flat-square)
This chart is a thin wrapper around the `FluxInstance` custom resource, which is
used by the [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator)

5
packages/system/fluxcd/values.yaml
View file

@ -5,10 +5,11 @@ flux-instance:
domain: cozy.local # -- default value is overriden in patches
distribution:
artifact: ""
version: 2.6.x
version: 2.7.x
registry: ghcr.io/fluxcd
components:
- source-controller
- source-watcher
- kustomize-controller
- helm-controller
- notification-controller
@ -33,7 +34,7 @@ flux-instance:
memory: 2048Mi
- target:
kind: Deployment
name: source-controller
name: (source-controller|source-watcher)
patch: |
- op: add
path: /spec/template/spec/containers/0/args/-