diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml index 1acc8f55..a6809843 100644 --- a/kubernetes/apps/default/kustomization.yaml +++ b/kubernetes/apps/default/kustomization.yaml @@ -6,11 +6,9 @@ resources: # Pre Flux-Kustomizations - namespace.yaml # Flux-Kustomizations - - atuin/ks.yaml - autobrr/ks.yaml - bazarr/ks.yaml - cross-seed/ks.yaml - - hajimari/ks.yaml - maintainerr/ks.yaml - minio/ks.yaml - omegabrr/ks.yaml diff --git a/kubernetes/apps/default/atuin/app/externalsecret.yaml b/kubernetes/apps/home/atuin/app/externalsecret.yaml similarity index 100% rename from kubernetes/apps/default/atuin/app/externalsecret.yaml rename to kubernetes/apps/home/atuin/app/externalsecret.yaml diff --git a/kubernetes/apps/default/atuin/app/helmrelease.yaml b/kubernetes/apps/home/atuin/app/helmrelease.yaml similarity index 100% rename from kubernetes/apps/default/atuin/app/helmrelease.yaml rename to kubernetes/apps/home/atuin/app/helmrelease.yaml diff --git a/kubernetes/apps/default/atuin/app/kustomization.yaml b/kubernetes/apps/home/atuin/app/kustomization.yaml similarity index 79% rename from kubernetes/apps/default/atuin/app/kustomization.yaml rename to kubernetes/apps/home/atuin/app/kustomization.yaml index 83349e15..db909dc1 100644 --- a/kubernetes/apps/default/atuin/app/kustomization.yaml +++ b/kubernetes/apps/home/atuin/app/kustomization.yaml @@ -3,6 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./externalsecret.yaml - - ./helmrelease.yaml + - externalsecret.yaml + - helmrelease.yaml - ../../../../templates/gatus/guarded diff --git a/kubernetes/apps/default/atuin/ks.yaml b/kubernetes/apps/home/atuin/ks.yaml similarity index 89% rename from kubernetes/apps/default/atuin/ks.yaml rename to kubernetes/apps/home/atuin/ks.yaml index e71869fa..76e1e1a7 100644 --- a/kubernetes/apps/default/atuin/ks.yaml +++ b/kubernetes/apps/home/atuin/ks.yaml @@ -6,14 +6,14 @@ metadata: name: &app atuin namespace: flux-system spec: - targetNamespace: default + targetNamespace: home commonMetadata: labels: app.kubernetes.io/name: *app dependsOn: - name: cloudnative-pg-cluster - name: external-secrets-stores - path: ./kubernetes/apps/default/atuin/app + path: ./kubernetes/apps/home/atuin/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/apps/default/hajimari/app/helmrelease.yaml b/kubernetes/apps/home/hajimari/app/helmrelease.yaml similarity index 100% rename from kubernetes/apps/default/hajimari/app/helmrelease.yaml rename to kubernetes/apps/home/hajimari/app/helmrelease.yaml diff --git a/kubernetes/apps/default/hajimari/app/kustomization.yaml b/kubernetes/apps/home/hajimari/app/kustomization.yaml similarity index 77% rename from kubernetes/apps/default/hajimari/app/kustomization.yaml rename to kubernetes/apps/home/hajimari/app/kustomization.yaml index 5dd7baca..dbc604ed 100644 --- a/kubernetes/apps/default/hajimari/app/kustomization.yaml +++ b/kubernetes/apps/home/hajimari/app/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./helmrelease.yaml + - helmrelease.yaml diff --git a/kubernetes/apps/default/hajimari/ks.yaml b/kubernetes/apps/home/hajimari/ks.yaml similarity index 81% rename from kubernetes/apps/default/hajimari/ks.yaml rename to kubernetes/apps/home/hajimari/ks.yaml index eaed86aa..ef1c963a 100644 --- a/kubernetes/apps/default/hajimari/ks.yaml +++ b/kubernetes/apps/home/hajimari/ks.yaml @@ -5,11 +5,11 @@ metadata: name: &app hajimari namespace: flux-system spec: - targetNamespace: default + targetNamespace: home commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/default/hajimari/app + path: ./kubernetes/apps/home/hajimari/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/apps/home/kustomization.yaml b/kubernetes/apps/home/kustomization.yaml new file mode 100644 index 00000000..2123a53f --- /dev/null +++ b/kubernetes/apps/home/kustomization.yaml @@ -0,0 +1,10 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + # Pre Flux-Kustomizations + - namespace.yaml + # Flux-Kustomizations + - atuin/ks.yaml + - hajimari/ks.yaml diff --git a/kubernetes/apps/home/namespace.yaml b/kubernetes/apps/home/namespace.yaml new file mode 100644 index 00000000..5633e362 --- /dev/null +++ b/kubernetes/apps/home/namespace.yaml @@ -0,0 +1,51 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: home + annotations: + kustomize.toolkit.fluxcd.io/prune: disabled + volsync.backube/privileged-movers: "true" +--- +# 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: home +spec: + type: alertmanager + address: https://alertmanager-prod-us-east-0.grafana.net # TODO: configure alert auth (basic auth, credentials already in external secrets) +--- +# 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: home +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 +--- +apiVersion: grafana.integreatly.org/v1beta1 +kind: GrafanaFolder +metadata: + name: grafana-folder + namespace: &namespaceName home +spec: + title: *namespaceName + allowCrossNamespaceImport: true + parentFolderUID: a03a5932-b7fc-4810-872e-e6297c0a9a7f + instanceSelector: + matchLabels: + dashboards: "grafana-cloud"