Skip to content

Commit

Permalink
fleet-sync
Browse files Browse the repository at this point in the history
Signed-off-by: Kingdon P Barrett <[email protected]>

add image controller

Signed-off-by: Kingdon Barrett <[email protected]>

refactor-1 image controller

Signed-off-by: Kingdon Barrett <[email protected]>

add image automation for bootstrap-repo

default namespace

Signed-off-by: Kingdon Barrett <[email protected]>

new policy

Signed-off-by: Kingdon Barrett <[email protected]>

remove tests

try version 56

Signed-off-by: Kingdon P Barrett <[email protected]>

was this broken in 57.0.0 or a later patch release

Signed-off-by: Kingdon P Barrett <[email protected]>

try 57.1.0

Signed-off-by: Kingdon P Barrett <[email protected]>

57.2.0

Signed-off-by: Kingdon P Barrett <[email protected]>

so 57.1.1 could still work theoretically

Signed-off-by: Kingdon P Barrett <[email protected]>

this version did not work 57.2.0

Signed-off-by: Kingdon P Barrett <[email protected]>

test the fix suggested by dotdc

prometheus-community/helm-charts#4410 (comment)
Thanks 🙏

Signed-off-by: Kingdon P Barrett <[email protected]>

try tag v2.12.0

Signed-off-by: Kingdon P Barrett <[email protected]>

revert kube-state-metrics v2.12.0 test

Signed-off-by: Kingdon P Barrett <[email protected]>

can go as high as 57.1.1

Signed-off-by: Kingdon P Barrett <[email protected]>

Replace deprecated loki-stack with loki+promtail helm charts

Signed-off-by: Mario Trangoni <[email protected]>

don't set storage: filesystem

Signed-off-by: Kingdon Barrett <[email protected]>

persistence: enable: false

Signed-off-by: Kingdon Barrett <[email protected]>

volumeClaimsEnabled

Signed-off-by: Kingdon Barrett <[email protected]>

test 58.0.x again

Signed-off-by: Kingdon Barrett <[email protected]>
  • Loading branch information
kingdonb committed May 13, 2024
1 parent 20fbdb0 commit d88a60a
Show file tree
Hide file tree
Showing 8 changed files with 1,538 additions and 37 deletions.
24 changes: 24 additions & 0 deletions clusters/test/fleet-infra/fleet-sync.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
apiVersion: source.toolkit.fluxcd.io/v1
kind: GitRepository
metadata:
name: fleet-infra
namespace: flux-system
spec:
interval: 1m0s
ref:
branch: main
url: https://github.com/kingdon-ci/fleet-infra
---
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: fleet-infra
namespace: flux-system
spec:
interval: 10m0s
path: ./clusters/talos-dev
prune: true
sourceRef:
kind: GitRepository
name: fleet-infra
1,404 changes: 1,403 additions & 1 deletion clusters/test/flux-system/gotk-components.yaml

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion monitoring/controllers/kube-prometheus-stack/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
interval: 1h
chart:
spec:
version: "58.x"
version: ">=58.0.0"
chart: kube-prometheus-stack
sourceRef:
kind: HelmRepository
Expand All @@ -29,6 +29,9 @@ spec:
valuesKey: kube-state-metrics-config.yaml
# https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
values:
# kube-state-metrics:
# image:
# tag: "v2.12.0"
alertmanager:
enabled: false
prometheus:
Expand Down
34 changes: 0 additions & 34 deletions monitoring/controllers/loki-stack/release.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ kind: Kustomization
namespace: monitoring
resources:
- repository.yaml
- release.yaml
- loki_release.yaml
- promtail_release.yaml
85 changes: 85 additions & 0 deletions monitoring/controllers/loki/loki_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease
metadata:
name: loki
spec:
interval: 5m
dependsOn:
- name: kube-prometheus-stack
chart:
spec:
version: "5.x"
chart: loki
sourceRef:
kind: HelmRepository
name: grafana-charts
interval: 60m
# https://github.com/grafana/loki/blob/main/production/helm/loki/values.yaml
values:
loki:
auth_enabled: false
serviceMonitor:
enabled: true
labels:
app.kubernetes.io/part-of: kube-prometheus-stack
commonConfig:
replication_factor: 1
storage:
type: 'filesystem'
chunk_store_config:
max_look_back_period: 24h
# Configure compactor
compactor:
shared_store: filesystem
compaction_interval: 10m
delete_request_cancel_period: 10m
retention_enabled: true
retention_delete_delay: 2h
retention_delete_worker_count: 150
limits_config:
retention_period: 24h
write:
persistence:
volumeClaimsEnabled: false
gateway:
enabled: true
singleBinary:
replicas: 1
# Monitoring section determines which monitoring features to enable
monitoring:
# Dashboards for monitoring Loki
dashboards:
# -- If enabled, create configmap with dashboards for monitoring Loki
enabled: false
selfMonitoring:
enabled: false
grafanaAgent:
installOperator: false
# The Loki canary pushes logs to and queries from this loki installation
# to test that it's working correctly
lokiCanary:
enabled: false
# -- Section for configuring optional Helm test
test:
enabled: false
extraObjects:
- apiVersion: v1
kind: ConfigMap
metadata:
name: loki-datasource
labels:
app: loki
chart: loki
release: loki
grafana_datasource: "1"
app.kubernetes.io/part-of: kube-prometheus-stack
data:
loki-datasource.yaml: |-
apiVersion: 1
datasources:
- name: Loki
type: loki
access: proxy
url: http://loki:{{ .Values.loki.server.http_listen_port }}
version: 1
isDefault: false
20 changes: 20 additions & 0 deletions monitoring/controllers/loki/promtail_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease
metadata:
name: promtail
spec:
interval: 5m
dependsOn:
- name: kube-prometheus-stack
chart:
spec:
version: "6.x"
chart: promtail
sourceRef:
kind: HelmRepository
name: grafana-charts
interval: 60m
# https://github.com/grafana/helm-charts/blob/main/charts/promtail/values.yaml
values:
test:
enabled: false
File renamed without changes.

0 comments on commit d88a60a

Please sign in to comment.