Skip to content

Commit 11fc410

Browse files
committed
refactor(flux): remove obsolete flux monitoring and add flux-operator
1 parent f4c581d commit 11fc410

5 files changed

Lines changed: 34 additions & 114 deletions

File tree

kubernetes/components/flux/flux-ks.yaml renamed to kubernetes/components/flux-operator/flux-ks.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ metadata:
66
name: &app flux-monitoring
77
namespace: flux-system
88
spec:
9-
targetNamespace: monitoring
10-
path: ./kubernetes/components/flux/
9+
path: ./kubernetes/components/flux-operator/
1110
commonMetadata:
1211
labels:
1312
app.kubernetes.io/name: *app
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
# yaml-language-server: $schema=https://kube-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
3+
apiVersion: source.toolkit.fluxcd.io/v1
4+
kind: OCIRepository
5+
metadata:
6+
name: flux-operator
7+
namespace: flux-system
8+
spec:
9+
interval: 5m
10+
layerSelector:
11+
mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
12+
operation: copy
13+
ref:
14+
tag: 0.30.0
15+
url: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
16+
---
17+
# yaml-language-server: $schema=https://kube-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
18+
apiVersion: helm.toolkit.fluxcd.io/v2
19+
kind: HelmRelease
20+
metadata:
21+
name: flux-operator
22+
namespace: flux-system
23+
spec:
24+
interval: 15m
25+
chartRef:
26+
kind: OCIRepository
27+
name: flux-operator
28+
namespace: flux-system
29+
dependsOn: []
30+
values:
31+
serviceMonitor:
32+
create: true

kubernetes/components/flux/kustomization.yaml renamed to kubernetes/components/flux-operator/kustomization.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ metadata:
44
name: flux-monitoring
55
namespace: monitoring
66
resources:
7-
- flux-ks.yaml
8-
- ./flux-podmonitor.yaml
9-
- ./flux-servicemonitor.yaml
7+
- helmrelease.yaml

kubernetes/components/flux/flux-podmonitor.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

kubernetes/components/flux/flux-servicemonitor.yaml

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)