Skip to content

Commit 7be5db8

Browse files
authored
[fluxcd] update to flux-operator 0.19.0 (#880)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced configurable API priority and fairness settings for the Flux Operator, allowing prioritization of API requests and inclusion of extra service accounts. - Added support for a new `skip` field in the `ResourceSetInputProvider` CRD to control update skipping based on label conditions. - **Bug Fixes** - Updated service account reference in admin ClusterRoleBinding to use the dedicated service account name for improved accuracy. - **Documentation** - Updated Helm chart and app version numbers to 0.19.0 in documentation and metadata. - Added documentation for the new `apiPriority` configuration option in the Flux Operator Helm chart. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 249950d + 44565dc commit 7be5db8

9 files changed

Lines changed: 90 additions & 7 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ annotations:
88
- name: Upstream Project
99
url: https://github.com/controlplaneio-fluxcd/flux-operator
1010
apiVersion: v2
11-
appVersion: v0.18.0
11+
appVersion: v0.19.0
1212
description: 'A Helm chart for deploying the Flux Operator. '
1313
home: https://github.com/controlplaneio-fluxcd
1414
icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
@@ -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.18.0
28+
version: 0.19.0

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

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

3-
![Version: 0.18.0](https://img.shields.io/badge/Version-0.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.18.0](https://img.shields.io/badge/AppVersion-v0.18.0-informational?style=flat-square)
3+
![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.19.0](https://img.shields.io/badge/AppVersion-v0.19.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
@@ -33,6 +33,7 @@ see the Flux Operator [documentation](https://fluxcd.control-plane.io/operator/)
3333
| Key | Type | Default | Description |
3434
|-----|------|---------|-------------|
3535
| affinity | object | `{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}}` | Pod affinity and anti-affinity settings. |
36+
| apiPriority | object | `{"enabled":false,"extraServiceAccounts":[],"level":"workload-high"}` | Kubernetes [API priority and fairness](https://kubernetes.io/docs/concepts/cluster-administration/flow-control/) settings. |
3637
| commonAnnotations | object | `{}` | Common annotations to add to all deployed objects including pods. |
3738
| commonLabels | object | `{}` | Common labels to add to all deployed objects including pods. |
3839
| extraArgs | list | `[]` | Container extra arguments. |

‎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
@@ -18,6 +18,6 @@ roleRef:
1818
name: cluster-admin
1919
subjects:
2020
- kind: ServiceAccount
21-
name: {{ include "flux-operator.fullname" . }}
21+
name: {{ include "flux-operator.serviceAccountName" . }}
2222
namespace: {{ .Release.Namespace }}
2323
{{- end }}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,18 @@ spec:
878878
required:
879879
- name
880880
type: object
881+
skip:
882+
description: Skip defines whether we need to skip input provider response
883+
updates.
884+
properties:
885+
labels:
886+
description: |-
887+
Labels specifies list of labels to skip input provider response when any of the label conditions matched.
888+
When prefixed with !, input provider response will be skipped if it does not have this label.
889+
items:
890+
type: string
891+
type: array
892+
type: object
881893
type:
882894
description: Type specifies the type of the input provider.
883895
enum:
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{{- if .Values.apiPriority.enabled }}
2+
apiVersion: flowcontrol.apiserver.k8s.io/v1
3+
kind: FlowSchema
4+
metadata:
5+
name: {{ include "flux-operator.fullname" . }}
6+
annotations:
7+
apf.kubernetes.io/autoupdate-spec: "false"
8+
spec:
9+
distinguisherMethod:
10+
type: ByUser
11+
matchingPrecedence: 950
12+
priorityLevelConfiguration:
13+
name: {{ .Values.apiPriority.level }}
14+
rules:
15+
- nonResourceRules:
16+
- nonResourceURLs:
17+
- '*'
18+
verbs:
19+
- '*'
20+
resourceRules:
21+
- apiGroups:
22+
- '*'
23+
clusterScope: true
24+
namespaces:
25+
- '*'
26+
resources:
27+
- '*'
28+
verbs:
29+
- '*'
30+
subjects:
31+
- kind: ServiceAccount
32+
serviceAccount:
33+
name: {{ include "flux-operator.serviceAccountName" . }}
34+
namespace: {{ .Release.Namespace }}
35+
{{- range .Values.apiPriority.extraServiceAccounts }}
36+
- kind: ServiceAccount
37+
serviceAccount:
38+
name: {{ .name }}
39+
namespace: {{ .namespace }}
40+
{{- end }}
41+
{{- end }}

‎packages/system/fluxcd-operator/charts/flux-operator/values.schema.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,25 @@
6363
},
6464
"type": "object"
6565
},
66+
"apiPriority": {
67+
"default": {
68+
"enabled": false,
69+
"extraServiceAccounts": [],
70+
"level": "workload-high"
71+
},
72+
"properties": {
73+
"enabled": {
74+
"type": "boolean"
75+
},
76+
"extraServiceAccounts": {
77+
"type": "array"
78+
},
79+
"level": {
80+
"type": "string"
81+
}
82+
},
83+
"type": "object"
84+
},
6685
"commonAnnotations": {
6786
"properties": {},
6887
"type": "object"

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ image:
3333
# Recommended value is system-cluster-critical.
3434
priorityClassName: "" # @schema default: "system-cluster-critical"
3535

36+
# -- Kubernetes [API priority and fairness](https://kubernetes.io/docs/concepts/cluster-administration/flow-control/) settings.
37+
apiPriority: # @schema default: {"enabled":false,"level":"workload-high","extraServiceAccounts":[]}
38+
enabled: false
39+
level: workload-high
40+
extraServiceAccounts: []
41+
# - name: kustomize-controller
42+
# namespace: flux-system
43+
# - name: helm-controller
44+
# namespace: flux-system
45+
3646
# -- Container resources requests and limits settings.
3747
resources: # @schema required: true
3848
limits:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ annotations:
88
- name: Upstream Project
99
url: https://github.com/controlplaneio-fluxcd/flux-operator
1010
apiVersion: v2
11-
appVersion: v0.18.0
11+
appVersion: v0.19.0
1212
description: 'A Helm chart for deploying a Flux instance managed by Flux Operator. '
1313
home: https://github.com/controlplaneio-fluxcd
1414
icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
@@ -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.18.0
28+
version: 0.19.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# flux-instance
22

3-
![Version: 0.18.0](https://img.shields.io/badge/Version-0.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.18.0](https://img.shields.io/badge/AppVersion-v0.18.0-informational?style=flat-square)
3+
![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.19.0](https://img.shields.io/badge/AppVersion-v0.19.0-informational?style=flat-square)
44

55
This chart is a thin wrapper around the `FluxInstance` custom resource, which is
66
used by the [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator)

0 commit comments

Comments
 (0)