feat: flux gh alerts to components (#8732)

onedr0p · Jan 27, 2025 · 645ebbc · 645ebbc
1 parent 97f38c1
commit 645ebbc
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 20 deletions.
diff --git a/kubernetes/apps/flux-system/flux-operator/instance/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/instance/kustomization.yaml
@@ -3,9 +3,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./github
   - ./helmrelease.yaml
   - ./prometheusrule.yaml
+  - ./webhook
 configMapGenerator:
   - name: flux-instance-helm-values
     files:

diff --git a/...tance/github/webhooks/externalsecret.yaml → ...ator/instance/webhook/externalsecret.yaml b/...tance/github/webhooks/externalsecret.yaml → ...ator/instance/webhook/externalsecret.yaml
diff --git a/...tor/instance/github/webhooks/ingress.yaml → ...ux-operator/instance/webhook/ingress.yaml b/...tor/instance/github/webhooks/ingress.yaml → ...ux-operator/instance/webhook/ingress.yaml
diff --git a/...stance/github/webhooks/kustomization.yaml → ...rator/instance/webhook/kustomization.yaml b/...stance/github/webhooks/kustomization.yaml → ...rator/instance/webhook/kustomization.yaml
diff --git a/...or/instance/github/webhooks/receiver.yaml → ...x-operator/instance/webhook/receiver.yaml b/...or/instance/github/webhooks/receiver.yaml → ...x-operator/instance/webhook/receiver.yaml
diff --git a/kubernetes/flux/components/alerts/alert.yaml → ...components/alerts/alertmanager/alert.yaml b/kubernetes/flux/components/alerts/alert.yaml → ...components/alerts/alertmanager/alert.yaml
@@ -3,10 +3,10 @@
 apiVersion: notification.toolkit.fluxcd.io/v1beta3
 kind: Alert
 metadata:
-  name: alert-manager
+  name: alertmanager
 spec:
   providerRef:
-    name: alert-manager
+    name: alertmanager
   eventSeverity: error
   eventSources:
     - kind: FluxInstance

diff --git a/...erator/instance/github/kustomization.yaml → ...ts/alerts/alertmanager/kustomization.yaml b/...erator/instance/github/kustomization.yaml → ...ts/alerts/alertmanager/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./notifications
-  - ./webhooks
+  - ./alert.yaml
+  - ./provider.yaml
diff --git a/...etes/flux/components/alerts/provider.yaml → ...ponents/alerts/alertmanager/provider.yaml b/...etes/flux/components/alerts/provider.yaml → ...ponents/alerts/alertmanager/provider.yaml
@@ -3,7 +3,7 @@
 apiVersion: notification.toolkit.fluxcd.io/v1beta3
 kind: Provider
 metadata:
-  name: alert-manager
+  name: alertmanager
 spec:
   type: alertmanager
   address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/
diff --git a/...ce/github/notifications/notification.yaml → .../flux/components/alerts/github/alert.yaml b/...ce/github/notifications/notification.yaml → .../flux/components/alerts/github/alert.yaml
@@ -1,15 +1,4 @@
 ---
-# 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: github
-spec:
-  type: github
-  address: https://github.com/onedr0p/home-ops
-  secretRef:
-    name: github-token-secret
----
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json
 apiVersion: notification.toolkit.fluxcd.io/v1beta3
 kind: Alert

diff --git a/.../github/notifications/externalsecret.yaml → ...ponents/alerts/github/externalsecret.yaml b/.../github/notifications/externalsecret.yaml → ...ponents/alerts/github/externalsecret.yaml
diff --git a/...e/github/notifications/kustomization.yaml → ...mponents/alerts/github/kustomization.yaml b/...e/github/notifications/kustomization.yaml → ...mponents/alerts/github/kustomization.yaml
@@ -3,5 +3,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./alert.yaml
   - ./externalsecret.yaml
-  - ./notification.yaml
+  - ./provider.yaml
diff --git a/kubernetes/flux/components/alerts/github/provider.yaml b/kubernetes/flux/components/alerts/github/provider.yaml
@@ -0,0 +1,11 @@
+---
+# 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: github
+spec:
+  type: github
+  address: https://github.com/onedr0p/home-ops
+  secretRef:
+    name: github-token-secret
diff --git a/kubernetes/flux/components/alerts/kustomization.yaml b/kubernetes/flux/components/alerts/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 resources:
-  - ./alert.yaml
-  - ./provider.yaml
+  - ./alertmanager
+  - ./github