refactor: observability/network ks

2025-09-17 18:24:14 +02:00 · 2025-04-18 14:17:51 +02:00
parent 26cd2cb62f
commit 476223f52b
87 changed files with 598 additions and 862 deletions
--- a/kubernetes/apps/observability/apprise/ks.yaml
+++ b/kubernetes/apps/observability/apprise/ks.yaml
@@ -4,28 +4,31 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app apprise
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
  dependsOn:
    - name: rook-ceph-cluster
+      namespace: rook-ceph
    - name: volsync
+      namespace: volsync
  components:
    - ../../../../components/gatus/guarded
    - ../../../../components/volsync
+  interval: 1h
  path: ./kubernetes/apps/observability/apprise/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
  postBuild:
    substitute:
      APP: *app
      VOLSYNC_CAPACITY: 1Gi
+  prune: true
+  retryInterval: 2m
+  sourceRef:
+    kind: GitRepository
+    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
--- a/kubernetes/apps/observability/blackbox-exporter/ks.yaml
+++ b/kubernetes/apps/observability/blackbox-exporter/ks.yaml
@@ -4,17 +4,22 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app blackbox-exporter
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
+  interval: 1h
  path: ./kubernetes/apps/observability/blackbox-exporter/app
+  postBuild:
+    substitute:
+      APP: *app
  prune: true
+  retryInterval: 2m
  sourceRef:
    kind: GitRepository
    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
  wait: false
-  interval: 30m
-  timeout: 15m
--- a/kubernetes/apps/observability/gatus/ks.yaml
+++ b/kubernetes/apps/observability/gatus/ks.yaml
@@ -4,24 +4,25 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app gatus
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
  dependsOn:
    - name: external-secrets-stores
      namespace: external-secrets
+  interval: 1h
  path: ./kubernetes/apps/observability/gatus/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
  postBuild:
    substitute:
      APP: *app
+  prune: true
+  retryInterval: 2m
+  sourceRef:
+    kind: GitRepository
+    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
--- a/kubernetes/apps/observability/grafana/ks.yaml
+++ b/kubernetes/apps/observability/grafana/ks.yaml
@@ -4,21 +4,22 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app grafana
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
+  interval: 1h
  path: ./kubernetes/apps/observability/grafana/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
  postBuild:
    substitute:
      APP: *app
+  prune: true
+  retryInterval: 2m
+  sourceRef:
+    kind: GitRepository
+    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
--- a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
+++ b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
@@ -4,41 +4,52 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app kube-prometheus-stack-crds
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
+  interval: 1h
  path: ./kubernetes/apps/observability/kube-prometheus-stack/crds
-  prune: false # never should be deleted
+  postBuild:
+    substitute:
+      APP: *app
+  prune: false
+  retryInterval: 2m
  sourceRef:
    kind: GitRepository
    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
+    namespace: flux-system
+  targetNamespace: *namespace
  timeout: 5m
+  wait: false
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app kube-prometheus-stack
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
  dependsOn:
    - name: rook-ceph-cluster
+      namespace: rook-ceph
    - name: kube-prometheus-stack-crds
+      namespace: observability
+  interval: 1h
  path: ./kubernetes/apps/observability/kube-prometheus-stack/app
+  postBuild:
+    substitute:
+      APP: *app
  prune: true
+  retryInterval: 2m
  sourceRef:
    kind: GitRepository
    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
+    namespace: flux-system
+  targetNamespace: *namespace
  timeout: 5m
+  wait: false
--- a/kubernetes/apps/observability/kustomization.yaml
+++ b/kubernetes/apps/observability/kustomization.yaml
@@ -2,10 +2,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: observability
+components:
+  - ../../components/common
 resources:
-  # Pre Flux-Kustomizations
-  - ./namespace.yaml
-  # Flux-Kustomizations
  - ./apprise/ks.yaml
  - ./blackbox-exporter/ks.yaml
  - ./gatus/ks.yaml
--- a/kubernetes/apps/observability/namespace.yaml
+++ b/kubernetes/apps/observability/namespace.yaml
@@ -1,37 +0,0 @@
---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: observability
-  labels:
-    kustomize.toolkit.fluxcd.io/prune: disabled
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json
-apiVersion: notification.toolkit.fluxcd.io/v1beta3
-kind: Provider
-metadata:
-  name: alert-manager
-  namespace: observability
-spec:
-  type: alertmanager
-  address: http://kube-prometheus-stack-alertmanager.observability:9093/api/v2/alerts/
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json
-apiVersion: notification.toolkit.fluxcd.io/v1beta3
-kind: Alert
-metadata:
-  name: alert-manager
-  namespace: observability
-spec:
-  providerRef:
-    name: alert-manager
-  eventSeverity: error
-  eventSources:
-    - kind: HelmRelease
-      name: "*"
-  exclusionList:
-    - "error.*lookup github\\.com"
-    - "error.*lookup raw\\.githubusercontent\\.com"
-    - "dial.*tcp.*timeout"
-    - "waiting.*socket"
-  suspend: false
--- a/kubernetes/apps/observability/pushgateway/ks.yaml
+++ b/kubernetes/apps/observability/pushgateway/ks.yaml
@@ -4,9 +4,8 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app pushgateway
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
@@ -14,15 +13,17 @@ spec:
    - name: kube-prometheus-stack-crds
  components:
    - ../../../../components/gatus/guarded
+  interval: 1h
  path: ./kubernetes/apps/observability/pushgateway/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
  postBuild:
    substitute:
      APP: *app
+  prune: true
+  retryInterval: 2m
+  sourceRef:
+    kind: GitRepository
+    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
--- a/kubernetes/apps/observability/scrutiny/ks.yaml
+++ b/kubernetes/apps/observability/scrutiny/ks.yaml
@@ -4,9 +4,8 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app scrutiny
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
@@ -14,43 +13,48 @@ spec:
    - name: external-secrets-stores
      namespace: external-secrets
    - name: rook-ceph-cluster
+      namespace: rook-ceph
    - name: volsync
+      namespace: volsync
  components:
    - ../../../../components/volsync
+  interval: 1h
  path: ./kubernetes/apps/observability/scrutiny/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
  postBuild:
    substitute:
      APP: *app
      VOLSYNC_CAPACITY: 2Gi
+  prune: true
+  retryInterval: 2m
+  sourceRef:
+    kind: GitRepository
+    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: &app scrutiny-collector
-  namespace: flux-system
+  namespace: &namespace observability
 spec:
-  targetNamespace: observability
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
+  interval: 1h
  path: ./kubernetes/apps/observability/scrutiny/collector
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
  postBuild:
    substitute:
      APP: *app
+  prune: true
+  retryInterval: 2m
+  sourceRef:
+    kind: GitRepository
+    name: home-ops-kubernetes
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false