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.

Sign up for GitHub

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: flux gh alerts to components #8732

Merged
merged 1 commit into from
Jan 27, 2025
Merged

feat: flux gh alerts to components #8732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion kubernetes/apps/flux-system/flux-operator/instance/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 ...tance/github/webhooks/externalsecret.yaml → ...ator/instance/webhook/externalsecret.yaml
View file
Open in desktop
File renamed without changes.
0 ...tor/instance/github/webhooks/ingress.yaml → ...ux-operator/instance/webhook/ingress.yaml
View file
Open in desktop
File renamed without changes.
0 ...stance/github/webhooks/kustomization.yaml → ...rator/instance/webhook/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...or/instance/github/webhooks/receiver.yaml → ...x-operator/instance/webhook/receiver.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions kubernetes/flux/components/alerts/alert.yaml → ...components/alerts/alertmanager/alert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...erator/instance/github/kustomization.yaml → ...ts/alerts/alertmanager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./notifications
- ./webhooks
- ./alert.yaml
- ./provider.yaml
2 changes: 1 addition & 1 deletion ...etes/flux/components/alerts/provider.yaml → ...ponents/alerts/alertmanager/provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
11 changes: 0 additions & 11 deletions ...ce/github/notifications/notification.yaml → .../flux/components/alerts/github/alert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 .../github/notifications/externalsecret.yaml → ...ponents/alerts/github/externalsecret.yaml
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...e/github/notifications/kustomization.yaml → ...mponents/alerts/github/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./alert.yaml
- ./externalsecret.yaml
- ./notification.yaml
- ./provider.yaml
11 changes: 11 additions & 0 deletions kubernetes/flux/components/alerts/github/provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions kubernetes/flux/components/alerts/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- ./alert.yaml
- ./provider.yaml
- ./alertmanager
- ./github
Loading