Skip to content

Commit 7e756e9

Browse files
feat(fluxcd): bump flux-operator/instance to v0.48.0, web UI opt-in
Bump flux-operator and flux-instance vendored charts from v0.33.0 to v0.48.0, moving the Flux distribution from 2.7.x to 2.8.x. This brings helm-controller v1.5.x, which exposes spec.install.healthCheckExprs on HelmRelease — a prerequisite for adding real readiness gating to dependency-target packages (postgres, mongodb, kafka, etc.). The new flux-operator chart defaults web.enabled=true; override it to false in packages/system/fluxcd-operator/values.yaml so the Flux Status Web UI stays opt-in. Operators wanting it can set web.enabled=true and configure web.config / web.configSecretName / web.ingress per the upstream chart values. Patches reapplied: - kubernetesEnvs.diff: matched cleanly (offset shift only) - networkPolicy.diff: extended to also restrict port 9080 (web UI port); hunk count updated 20 -> 22 Pre-flight: no references to the v0.39-removed --disable-wait-interruption flag anywhere in packages/ or internal/. Verified locally: - helm template renders both packages without errors - web.enabled=false (default): no web Deployment/Service/NetworkPolicy - web.enabled=true: renders web NetworkPolicy on port 9080 - CiliumClusterwideNetworkPolicy lists 8080/8081/9080 - FluxInstance distribution.version: "2.8.x", all 7 components present - Cozystack kustomize patches (concurrent, requeue, storage-adv-addr, events-addr) intact Notable upstream changes between v0.33 and v0.48: - Flux 2.8.x with HelmRelease inventory format change (auto-migrated) - Reliability fixes for stuck FluxInstance/ResourceSet on health-check cancellation (v0.39, v0.46) - New CLI: flux-operator migrate, diff, patch instance, distro mirror - ResourceSetInputProvider: GitLab Environments, GitHub App, Gitea/Forgejo - CVE-2026-23990 (Web UI OIDC impersonation bypass) — N/A while web is off Assisted-By: Claude <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent 7520967 commit 7e756e9

28 files changed

Lines changed: 717 additions & 52 deletions

‎packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ annotations:
22
artifacthub.io/license: AGPL-3.0
33
artifacthub.io/links: |
44
- name: Documentation
5-
url: https://fluxcd.control-plane.io/operator
5+
url: https://fluxoperator.dev/docs
66
- name: Chart Source
77
url: https://github.com/controlplaneio-fluxcd/charts
88
- name: Upstream Project
99
url: https://github.com/controlplaneio-fluxcd/flux-operator
1010
apiVersion: v2
11-
appVersion: v0.33.0
11+
appVersion: v0.48.0
1212
description: 'A Helm chart for deploying the Flux Operator. '
13-
home: https://github.com/controlplaneio-fluxcd
13+
home: https://fluxoperator.dev
1414
icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
1515
keywords:
1616
- flux
@@ -25,4 +25,4 @@ sources:
2525
- https://github.com/controlplaneio-fluxcd/flux-operator
2626
- https://github.com/controlplaneio-fluxcd/charts
2727
type: application
28-
version: 0.33.0
28+
version: 0.48.0

‎packages/system/fluxcd-operator/charts/flux-operator/README.md‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# flux-operator
22

3-
![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)
3+
![Version: 0.48.0](https://img.shields.io/badge/Version-0.48.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.48.0](https://img.shields.io/badge/AppVersion-v0.48.0-informational?style=flat-square)
44

55
The [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator) provides a
66
declarative API for the installation and upgrade of CNCF [Flux](https://fluxcd.io) and the
@@ -9,12 +9,15 @@ ControlPlane [enterprise distribution](https://control-plane.io/enterprise-for-f
99
The operator automates the patching for hotfixes and CVEs affecting the Flux controllers container images
1010
and enables the configuration of multi-tenancy lockdown on Kubernetes and OpenShift clusters.
1111

12+
The operator comes with the Flux Status Page web UI exposed on port `9080` that allows users to visualize the
13+
status of the Flux installation and monitor the GitOps delivery pipeline in real-time.
14+
1215
## Prerequisites
1316

14-
- Kubernetes 1.22+
17+
- Kubernetes 1.30+
1518
- Helm 3.8+
1619

17-
## Installing the Chart
20+
## Installing Flux Operator
1821

1922
To install the operator in the `flux-system` namespace:
2023

@@ -25,8 +28,22 @@ helm install flux-operator oci://ghcr.io/controlplaneio-fluxcd/charts/flux-opera
2528
--wait
2629
```
2730

31+
## Installing the Flux Web UI as a Standalone Deployment
32+
33+
You can install the Flux Status Web UI as a dedicated deployment in your Kubernetes cluster,
34+
separate from the Flux Operator with:
35+
36+
```console
37+
helm install flux-web oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator \
38+
--namespace flux-system \
39+
--set fullnameOverride=flux-web \
40+
--set web.serverOnly=true \
41+
--set installCRDs=false \
42+
--wait
43+
```
44+
2845
To deploy the Flux controllers and to configure automated updates,
29-
see the Flux Operator [documentation](https://fluxcd.control-plane.io/operator/).
46+
see the Flux Operator [documentation](https://fluxoperator.dev/docs/).
3047

3148
## Values
3249

@@ -47,20 +64,29 @@ see the Flux Operator [documentation](https://fluxcd.control-plane.io/operator/)
4764
| livenessProbe | object | `{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20}` | Container liveness probe settings. |
4865
| logLevel | string | `"info"` | Container logging level flag. |
4966
| marketplace | object | `{"account":"","license":"","type":""}` | Marketplace settings. |
50-
| multitenancy | object | `{"defaultServiceAccount":"flux-operator","defaultWorkloadIdentityServiceAccount":"flux-operator","enabled":false,"enabledForWorkloadIdentity":false}` | Enable [multitenancy lockdown](https://fluxcd.control-plane.io/operator/resourceset/#role-based-access-control) for the ResourceSet APIs. |
67+
| multitenancy | object | `{"defaultServiceAccount":"flux-operator","defaultWorkloadIdentityServiceAccount":"flux-operator","enabled":false,"enabledForWorkloadIdentity":false}` | Enable [multitenancy lockdown](https://fluxoperator.dev/docs/crd/resourceset/#role-based-access-control) for the ResourceSet APIs. |
5168
| nameOverride | string | `""` | |
5269
| nodeSelector | object | `{}` | Pod Node Selector settings. |
5370
| podSecurityContext | object | `{}` | Pod security context settings. |
5471
| priorityClassName | string | `""` | Pod priority class name. Recommended value is system-cluster-critical. |
5572
| rbac.create | bool | `true` | Grant the cluster-admin role to the flux-operator service account (required for the Flux Instance deployment). |
5673
| rbac.createAggregation | bool | `true` | Grant the Kubernetes view, edit and admin roles access to ResourceSet APIs. |
5774
| readinessProbe | object | `{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10}` | Container readiness probe settings. |
58-
| reporting | object | `{"interval":"5m"}` | Flux [reporting](https://fluxcd.control-plane.io/operator/fluxreport/) settings. |
75+
| reporting | object | `{"interval":"5m"}` | Flux [reporting](https://fluxoperator.dev/docs/crd/fluxreport/) settings. |
5976
| resources | object | `{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"64Mi"}}` | Container resources requests and limits settings. |
6077
| securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}` | Container security context settings. The default is compliant with the pod security restricted profile. |
6178
| serviceAccount | object | `{"automount":true,"create":true,"name":""}` | Pod service account settings. The name of the service account defaults to the release name. |
6279
| serviceMonitor | object | `{"create":false,"interval":"60s","labels":{},"scrapeTimeout":"30s"}` | Prometheus Operator scraping settings. |
6380
| tolerations | list | `[]` | Pod tolerations settings. |
81+
| web.config | object | `{}` | The spec of the [Web Config API](https://fluxoperator.dev/docs/web-ui/web-config-api/) |
82+
| web.configSecretName | string | `""` | Reference to an existing Secret in the same namespace as the deployment containing the Web Config API. Should have the key `config.yaml`. |
83+
| web.enabled | bool | `true` | Enable the [Flux Status web server](https://fluxoperator.dev/web-ui/) on port 9080. |
84+
| web.httpRoute | object | `{"annotations":{},"enabled":false,"hostnames":[],"parentRefs":[]}` | Gateway API HTTPRoute settings for the Flux Status web interface. |
85+
| web.ingress | object | `{"annotations":{},"className":"","enabled":false,"hosts":[],"tls":[]}` | Ingress settings for the Flux Status web interface. |
86+
| web.networkPolicy | object | `{"create":true}` | Create a NetworkPolicy to allow access to the Flux Status web interface. |
87+
| web.rbac | object | `{"createAggregation":false,"createRoles":true}` | Create standard roles for [user access management](https://fluxoperator.dev/docs/web-ui/user-management/). |
88+
| web.serverOnly | bool | `false` | Run the Flux Status web server as a standalone deployment (requires a dedicated Helm release). |
89+
| web.serverReplicas | int | `1` | Number of replicas for the Flux Status web server standalone deployment (only applicable if `web.serverOnly` is `true`). |
6490

6591
## Source Code
6692

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation at https://fluxcd.control-plane.io/operator/
1+
Documentation at https://fluxoperator.dev/docs/

‎packages/system/fluxcd-operator/charts/flux-operator/templates/_helpers.tpl‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,63 @@ Create the name of the service account to use
5656
{{- define "flux-operator.serviceAccountName" -}}
5757
{{- default (include "flux-operator.fullname" .) .Values.serviceAccount.name }}
5858
{{- end }}
59+
60+
{{/*
61+
Check if web config secret should be created.
62+
Returns "true" when web is enabled, config is provided inline, and no external secret is referenced.
63+
*/}}
64+
{{- define "flux-operator.createWebConfigSecret" -}}
65+
{{- if and .Values.web.enabled .Values.web.config (not .Values.web.configSecretName) -}}
66+
true
67+
{{- end -}}
68+
{{- end }}
69+
70+
{{/*
71+
Check if an external web config secret is referenced.
72+
Returns "true" when web is enabled, an external secret name is provided, and no inline config is set.
73+
*/}}
74+
{{- define "flux-operator.useWebConfigSecret" -}}
75+
{{- if and .Values.web.enabled .Values.web.configSecretName (not .Values.web.config) -}}
76+
true
77+
{{- end -}}
78+
{{- end }}
79+
80+
{{/*
81+
Check if running in web server only mode.
82+
Returns "true" when web is enabled and serverOnly mode is set.
83+
*/}}
84+
{{- define "flux-operator.webServerOnly" -}}
85+
{{- if and .Values.web.enabled .Values.web.serverOnly -}}
86+
true
87+
{{- end -}}
88+
{{- end }}
89+
90+
{{/*
91+
Check if web server replicas should be set.
92+
Returns "true" when web is enabled, serverOnly mode is set, and serverReplicas is greater than 1.
93+
*/}}
94+
{{- define "flux-operator.setWebServerReplicas" -}}
95+
{{- if and .Values.web.enabled .Values.web.serverOnly (gt (int .Values.web.serverReplicas) 1) -}}
96+
true
97+
{{- end -}}
98+
{{- end }}
99+
100+
{{/*
101+
Check if web roles should be created.
102+
Returns "true" when web is enabled and createRoles is enabled.
103+
*/}}
104+
{{- define "flux-operator.createWebRoles" -}}
105+
{{- if and .Values.web.enabled .Values.web.rbac.createRoles -}}
106+
true
107+
{{- end -}}
108+
{{- end }}
109+
110+
{{/*
111+
Check if web roles aggregation should be created.
112+
Returns "true" when web is enabled and createAggregation is enabled.
113+
*/}}
114+
{{- define "flux-operator.createWebRolesAggregation" -}}
115+
{{- if and .Values.web.enabled .Values.web.rbac.createAggregation -}}
116+
true
117+
{{- end -}}
118+
{{- end }}

‎packages/system/fluxcd-operator/charts/flux-operator/templates/admin-clusterrole.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.rbac.create }}
1+
{{- if and .Values.rbac.create (not (include "flux-operator.webServerOnly" .)) }}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:

‎packages/system/fluxcd-operator/charts/flux-operator/templates/aggregate-clusterrole.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.rbac.createAggregation }}
1+
{{- if and .Values.rbac.createAggregation (not (include "flux-operator.webServerOnly" .)) }}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:

0 commit comments

Comments
 (0)