Skip to content

Commit 6f279fd

Browse files
committed
upgrade flux-operator to 0.9.0
Signed-off-by: Kingdon Barrett <[email protected]>
1 parent 910a9e5 commit 6f279fd

7 files changed

Lines changed: 117 additions & 52 deletions

File tree

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

Lines changed: 4 additions & 6 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.6.0
11+
appVersion: v0.9.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
@@ -18,13 +18,11 @@ keywords:
1818
- gitops
1919
kubeVersion: '>=1.22.0-0'
2020
maintainers:
21-
22-
name: Stefan Prodan
23-
- name: Soule Ba
24-
21+
22+
name: ControlPlane Flux Team
2523
name: flux-operator
2624
sources:
2725
- https://github.com/controlplaneio-fluxcd/flux-operator
2826
- https://github.com/controlplaneio-fluxcd/charts
2927
type: application
30-
version: 0.6.0
28+
version: 0.9.0

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

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

3-
![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.0](https://img.shields.io/badge/AppVersion-v0.6.0-informational?style=flat-square)
3+
![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0](https://img.shields.io/badge/AppVersion-v0.9.0-informational?style=flat-square)
44

5-
The [Flux Operator](https://github.com/controlplaneio-fluxcd) provides a declarative API
6-
for the installation and upgrade of CNCF [Flux](https://fluxcd.io) and the
5+
The [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator) provides a
6+
declarative API for the installation and upgrade of CNCF [Flux](https://fluxcd.io) and the
77
ControlPlane [enterprise distribution](https://control-plane.io/enterprise-for-flux-cd/).
88

99
The operator automates the patching for hotfixes and CVEs affecting the Flux controllers container images
@@ -49,6 +49,7 @@ see the Flux Operator [documentation](https://fluxcd.control-plane.io/operator/)
4949
| resources | object | `{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"64Mi"}}` | Container resources requests and limits settings. |
5050
| 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. |
5151
| serviceAccount | object | `{"automount":true,"create":true,"name":""}` | Pod service account settings. The name of the service account defaults to the release name. |
52+
| serviceMonitor | object | `{"create":false,"interval":"60s","labels":{},"scrapeTimeout":"30s"}` | Prometheus Operator scraping settings. |
5253
| tolerations | list | `[]` | Pod tolerations settings. |
5354

5455
## Source Code

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

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.1
77
helm.sh/resource-policy: keep
88
labels:
99
app.kubernetes.io/instance: '{{ .Release.Name }}'
@@ -77,6 +77,12 @@ spec:
7777
NetworkPolicy restricts network access to the current namespace.
7878
Defaults to true.
7979
type: boolean
80+
tenantDefaultServiceAccount:
81+
description: |-
82+
TenantDefaultServiceAccount is the name of the service account
83+
to use as default when the multitenant lockdown is enabled.
84+
Defaults to the 'default' service account from the tenant namespace.
85+
type: string
8086
type:
8187
default: kubernetes
8288
description: |-
@@ -202,6 +208,29 @@ spec:
202208
type: object
203209
type: array
204210
type: object
211+
migrateResources:
212+
default: true
213+
description: |-
214+
MigrateResources instructs the controller to migrate the Flux custom resources
215+
from the previous version to the latest API version specified in the CRD.
216+
Defaults to true.
217+
type: boolean
218+
sharding:
219+
description: Sharding holds the specification of the sharding configuration.
220+
properties:
221+
key:
222+
default: sharding.fluxcd.io/key
223+
description: Key is the label key used to shard the resources.
224+
type: string
225+
shards:
226+
description: Shards is the list of shard names.
227+
items:
228+
type: string
229+
minItems: 1
230+
type: array
231+
required:
232+
- shards
233+
type: object
205234
storage:
206235
description: |-
207236
Storage holds the specification of the source-controller
@@ -274,7 +303,6 @@ spec:
274303
type: boolean
275304
required:
276305
- distribution
277-
- wait
278306
type: object
279307
status:
280308
description: FluxInstanceStatus defines the observed state of FluxInstance
@@ -307,16 +335,8 @@ spec:
307335
conditions:
308336
description: Conditions contains the readiness conditions of the object.
309337
items:
310-
description: "Condition contains details for one aspect of the current
311-
state of this API Resource.\n---\nThis struct is intended for
312-
direct use as an array at the field path .status.conditions. For
313-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
314-
observations of a foo's current state.\n\t // Known .status.conditions.type
315-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
316-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
317-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
318-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
319-
\ // other fields\n\t}"
338+
description: Condition contains details for one aspect of the current
339+
state of this API Resource.
320340
properties:
321341
lastTransitionTime:
322342
description: |-
@@ -357,12 +377,7 @@ spec:
357377
- Unknown
358378
type: string
359379
type:
360-
description: |-
361-
type of condition in CamelCase or in foo.example.com/CamelCase.
362-
---
363-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
364-
useful (see .node.status.conditions), the ability to deconflict is important.
365-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
380+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
366381
maxLength: 316
367382
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
368383
type: string
@@ -429,7 +444,7 @@ apiVersion: apiextensions.k8s.io/v1
429444
kind: CustomResourceDefinition
430445
metadata:
431446
annotations:
432-
controller-gen.kubebuilder.io/version: v0.15.0
447+
controller-gen.kubebuilder.io/version: v0.16.1
433448
helm.sh/resource-policy: keep
434449
labels:
435450
app.kubernetes.io/instance: '{{ .Release.Name }}'
@@ -622,16 +637,8 @@ spec:
622637
conditions:
623638
description: Conditions contains the readiness conditions of the object.
624639
items:
625-
description: "Condition contains details for one aspect of the current
626-
state of this API Resource.\n---\nThis struct is intended for
627-
direct use as an array at the field path .status.conditions. For
628-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
629-
observations of a foo's current state.\n\t // Known .status.conditions.type
630-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
631-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
632-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
633-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
634-
\ // other fields\n\t}"
640+
description: Condition contains details for one aspect of the current
641+
state of this API Resource.
635642
properties:
636643
lastTransitionTime:
637644
description: |-
@@ -672,12 +679,7 @@ spec:
672679
- Unknown
673680
type: string
674681
type:
675-
description: |-
676-
type of condition in CamelCase or in foo.example.com/CamelCase.
677-
---
678-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
679-
useful (see .node.status.conditions), the ability to deconflict is important.
680-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
682+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
681683
maxLength: 316
682684
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
683685
type: string

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ spec:
1818
{{- include "flux-operator.selectorLabels" . | nindent 6 }}
1919
template:
2020
metadata:
21-
{{- with .Values.commonAnnotations }}
2221
annotations:
22+
prometheus.io/scrape: "true"
23+
prometheus.io/port: "8080"
24+
prometheus.io/path: "/metrics"
25+
{{- with .Values.commonAnnotations }}
2326
{{- toYaml . | nindent 8 }}
24-
{{- end }}
27+
{{- end }}
2528
labels:
2629
{{- include "flux-operator.labels" . | nindent 8 }}
2730
{{- with .Values.commonLabels }}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{{- if .Values.serviceMonitor.create }}
2+
apiVersion: monitoring.coreos.com/v1
3+
kind: ServiceMonitor
4+
metadata:
5+
name: {{ include "flux-operator.fullname" . }}
6+
namespace: {{ .Release.Namespace }}
7+
labels:
8+
{{- include "flux-operator.labels" . | nindent 4 }}
9+
{{- with .Values.commonLabels }}
10+
{{- toYaml . | nindent 4 }}
11+
{{- end }}
12+
{{- with .Values.serviceMonitor.labels }}
13+
{{- toYaml . | nindent 4 }}
14+
{{- end }}
15+
{{- with .Values.commonAnnotations }}
16+
annotations:
17+
{{- toYaml . | nindent 4 }}
18+
{{- end }}
19+
spec:
20+
namespaceSelector:
21+
matchNames:
22+
- {{ .Release.Namespace | quote }}
23+
selector:
24+
matchLabels:
25+
{{- include "flux-operator.selectorLabels" . | nindent 6 }}
26+
endpoints:
27+
- targetPort: 8080
28+
path: /metrics
29+
interval: {{ .Values.serviceMonitor.interval }}
30+
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
31+
{{- end }}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,29 @@
293293
},
294294
"type": "object"
295295
},
296+
"serviceMonitor": {
297+
"default": {
298+
"create": false,
299+
"interval": "60s",
300+
"scrapeTimeout": "30s"
301+
},
302+
"properties": {
303+
"create": {
304+
"type": "boolean"
305+
},
306+
"interval": {
307+
"type": "string"
308+
},
309+
"labels": {
310+
"properties": {},
311+
"type": "object"
312+
},
313+
"scrapeTimeout": {
314+
"type": "string"
315+
}
316+
},
317+
"type": "object"
318+
},
296319
"tolerations": {
297320
"items": {
298321
"type": "object"

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,21 @@ affinity: # @schema default: {"nodeAffinity":{"requiredDuringSchedulingIgnoredDu
8484
# -- Pod tolerations settings.
8585
tolerations: [ ] # @schema item: object ; uniqueItems: true
8686

87-
# -- Marketplace settings.
88-
marketplace:
89-
type: ""
90-
license: ""
91-
account: ""
92-
9387
# -- If `true`, the container ports (`8080` and `8081`) are exposed on the host network.
9488
hostNetwork: false # @schema default: false
9589

9690
# -- Container extra environment variables.
9791
extraEnvs: [ ] # @schema item: object ; uniqueItems: true
92+
93+
# -- Prometheus Operator scraping settings.
94+
serviceMonitor: # @schema default: {"create":false,"interval":"60s","scrapeTimeout":"30s"}
95+
create: false
96+
interval: 60s
97+
scrapeTimeout: 30s
98+
labels: { }
99+
100+
# -- Marketplace settings.
101+
marketplace:
102+
type: ""
103+
license: ""
104+
account: ""

0 commit comments

Comments
 (0)