Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: deploy flux with helm #3481

Merged
merged 3 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/renovate/groups.json5
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,6 @@
},
"separateMinorPatch": true
},
{
"description": ["Flux Group"],
"groupName": "Flux",
"matchPackagePatterns": ["fluxcd"],
"matchDatasources": ["docker", "github-tags"],
"versioning": "semver",
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
"separateMinorPatch": true
},
{
"description": ["Intel Device Plugins Group"],
"groupName": "Intel-Device-Plugins",
Expand Down
1 change: 0 additions & 1 deletion .taskfiles/bootstrap/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ tasks:
flux:
desc: Bootstrap Flux [CLUSTER=main]
cmds:
- kubectl apply --server-side --kustomize {{.CLUSTER_DIR}}/bootstrap/apps
- for: { var: TEMPLATES }
cmd: op run --env-file {{.CLUSTER_DIR}}/bootstrap/bootstrap.env --no-masking -- minijinja-cli {{.ITEM}} | kubectl apply --server-side --filename -
- kubectl apply --server-side --filename {{.CLUSTER_DIR}}/flux/settings/cluster-settings.yaml
Expand Down
73 changes: 73 additions & 0 deletions kubernetes/main/apps/flux-system/flux/app/helm-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
---
crds:
annotations:
helm.sh/resource-policy: keep

helmController:
container:
additionalArgs:
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- --concurrent=10
- --requeue-dependency=5s
# Flux near OOM detection for Helm
# Ref: https://fluxcd.io/flux/installation/configuration/helm-oom-detection/
- --feature-gates=OOMWatch=true
- --oom-watch-memory-threshold=95
- --oom-watch-interval=500ms
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

imageAutomationController:
create: false

imageReflectionController:
create: false

kustomizeController:
container:
additionalArgs:
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- --concurrent=10
- --requeue-dependency=5s
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

notificationController:
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

sourceController:
container:
additionalArgs:
# Enable Helm repositories caching
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#enable-helm-repositories-caching
- --helm-cache-max-size=10
- --helm-cache-ttl=60m
- --helm-cache-purge-interval=5m
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- --concurrent=10
- --requeue-dependency=5s
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

policies:
create: false

prometheus:
podMonitor:
create: true
27 changes: 27 additions & 0 deletions kubernetes/main/apps/flux-system/flux/app/helmrelease.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
# yaml-language-server: $schema=https://kube-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: flux
spec:
interval: 30m
chart:
spec:
chart: flux2
version: 2.14.0
sourceRef:
kind: HelmRepository
name: fluxcd-community
namespace: flux-system
install:
remediation:
retries: 3
upgrade:
cleanupOnFail: true
remediation:
strategy: rollback
retries: 3
valuesFrom:
- kind: ConfigMap
name: flux-helm-values
13 changes: 13 additions & 0 deletions kubernetes/main/apps/flux-system/flux/app/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./helmrelease.yaml
- ./prometheusrule.yaml
configMapGenerator:
- name: flux-helm-values
files:
- values.yaml=./helm-values.yaml
configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
nameReference:
- kind: ConfigMap
version: v1
fieldSpecs:
- path: spec/valuesFrom/name
kind: HelmRelease
32 changes: 32 additions & 0 deletions kubernetes/main/apps/flux-system/flux/app/prometheusrule.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/monitoring.coreos.com/prometheusrule_v1.json
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: flux-rules
namespace: flux-system
spec:
groups:
- name: flux.rules
rules:
- alert: FluxComponentAbsent
annotations:
summary: Flux component has disappeared from Prometheus target discovery.
expr: |
absent(up{job=~".*flux-system.*"} == 1)
for: 15m
labels:
severity: critical
- alert: FluxReconciliationFailure
annotations:
summary: >-
{{ $labels.kind }} {{ $labels.namespace }}/{{ $labels.name }} reconciliation
has been failing for more than 15 minutes.
expr: |
max(gotk_reconcile_condition{status="False",type="Ready"}) by (namespace, name, kind)
+
on(namespace, name, kind) (max(gotk_reconcile_condition{status="Deleted"})
by (namespace, name, kind)) * 2 == 1
for: 15m
labels:
severity: critical
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./github
- ./webhooks
42 changes: 42 additions & 0 deletions kubernetes/main/apps/flux-system/flux/ks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# yaml-language-server: $schema=https://kube-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: &app flux
namespace: flux-system
spec:
targetNamespace: flux-system
commonMetadata:
labels:
app.kubernetes.io/name: *app
path: ./kubernetes/main/apps/flux-system/flux/app
prune: false # never should be deleted
sourceRef:
kind: GitRepository
name: home-kubernetes
wait: false
interval: 30m
timeout: 5m
---
# yaml-language-server: $schema=https://kube-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: &app flux-github
namespace: flux-system
spec:
targetNamespace: flux-system
commonMetadata:
labels:
app.kubernetes.io/name: *app
dependsOn:
- name: external-secrets-stores
path: ./kubernetes/main/apps/flux-system/flux/github
prune: true
sourceRef:
kind: GitRepository
name: home-kubernetes
wait: false
interval: 30m
timeout: 5m
4 changes: 3 additions & 1 deletion kubernetes/main/apps/flux-system/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
# Pre Flux-Kustomizations
- ./namespace.yaml
- ./addons/ks.yaml
# Flux-Kustomizations
- ./clickops/ks.yaml
- ./flux/ks.yaml
- ./weave-gitops/ks.yaml
38 changes: 32 additions & 6 deletions kubernetes/main/bootstrap/apps/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ repositories:
- name: coredns
url: https://coredns.github.io/helm

- name: postfinance
url: https://postfinance.github.io/kubelet-csr-approver

releases:
- name: kube-prometheus-stack-crds
namespace: observability
Expand All @@ -36,7 +33,8 @@ releases:
- commonLabels:
helm.toolkit.fluxcd.io/name: *name
helm.toolkit.fluxcd.io/namespace: *namespace
needs: ["observability/kube-prometheus-stack-crds"]
needs:
- observability/kube-prometheus-stack-crds

- name: &name coredns
namespace: &namespace kube-system
Expand All @@ -47,11 +45,39 @@ releases:
- customLabels:
helm.toolkit.fluxcd.io/name: *name
helm.toolkit.fluxcd.io/namespace: *namespace
needs: ["kube-system/cilium"]
needs:
- kube-system/cilium

- name: spegel
namespace: kube-system
chart: oci://ghcr.io/spegel-org/helm-charts/spegel
version: v0.0.28
values: ["../../apps/kube-system/spegel/app/helm-values.yaml"]
needs: ["kube-system/coredns"]
needs:
- kube-system/cilium

- name: &name flux
namespace: &namespace flux-system
chart: oci://ghcr.io/fluxcd-community/charts/flux2
version: 2.14.0
values:
- ../../apps/flux-system/flux/app/helm-values.yaml
- helmController:
labels:
helm.toolkit.fluxcd.io/name: *name
helm.toolkit.fluxcd.io/namespace: *namespace
- kustomizeController:
labels:
helm.toolkit.fluxcd.io/name: *name
helm.toolkit.fluxcd.io/namespace: *namespace
- notificationController:
labels:
helm.toolkit.fluxcd.io/name: *name
helm.toolkit.fluxcd.io/namespace: *namespace
- sourceController:
labels:
helm.toolkit.fluxcd.io/name: *name
helm.toolkit.fluxcd.io/namespace: *namespace
needs:
- kube-system/coredns
- kube-system/spegel
11 changes: 11 additions & 0 deletions kubernetes/shared/repos/helm/fluxcd-community.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# yaml-language-server: $schema=https://kube-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: fluxcd-community
namespace: flux-system
spec:
type: oci
interval: 5m
url: oci://ghcr.io/fluxcd-community/charts
1 change: 1 addition & 0 deletions kubernetes/shared/repos/helm/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ resources:
- ./descheduler.yaml
- ./external-dns.yaml
- ./external-secrets.yaml
- ./fluxcd-community.yaml
- ./grafana.yaml
- ./ingress-nginx.yaml
- ./intel.yaml
Expand Down
73 changes: 73 additions & 0 deletions kubernetes/utility/apps/flux-system/flux/app/helm-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
---
crds:
annotations:
helm.sh/resource-policy: keep

helmController:
container:
additionalArgs:
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- --concurrent=10
- --requeue-dependency=5s
# Flux near OOM detection for Helm
# Ref: https://fluxcd.io/flux/installation/configuration/helm-oom-detection/
- --feature-gates=OOMWatch=true
- --oom-watch-memory-threshold=95
- --oom-watch-interval=500ms
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

imageAutomationController:
create: false

imageReflectionController:
create: false

kustomizeController:
container:
additionalArgs:
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- --concurrent=10
- --requeue-dependency=5s
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

notificationController:
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

sourceController:
container:
additionalArgs:
# Enable Helm repositories caching
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#enable-helm-repositories-caching
- --helm-cache-max-size=10
- --helm-cache-ttl=60m
- --helm-cache-purge-interval=5m
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- --concurrent=10
- --requeue-dependency=5s
resources:
requests:
cpu: 100m
limits:
memory: 2Gi

policies:
create: false

prometheus:
podMonitor:
create: true
Loading
Loading