From 78d9a667a07186e73cc5734ad60068ab64989152 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:46:15 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20gatus=20configmaps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubernetes/apps/default/atuin/app/gatus.yaml | 26 ------------------- .../apps/default/atuin/app/kustomization.yaml | 2 +- kubernetes/apps/default/atuin/ks.yaml | 1 + .../apps/default/authelia/app/gatus.yaml | 22 ---------------- .../default/authelia/app/kustomization.yaml | 2 +- .../default/freshrss/app/kustomization.yaml | 2 +- kubernetes/apps/default/freshrss/ks.yaml | 1 + .../apps/default/hajimari/app/gatus.yaml | 22 ---------------- .../default/hajimari/app/kustomization.yaml | 2 +- .../default/invidious/app/kustomization.yaml | 2 +- .../default/jellyfin/app/helmrelease.yaml | 2 ++ kubernetes/apps/default/jellyfin/ks.yaml | 1 + kubernetes/apps/default/kresus/ks.yaml | 1 + .../default/libmedium/app/kustomization.yaml | 2 +- .../default/libreddit/app/kustomization.yaml | 2 +- kubernetes/apps/default/linkding/ks.yaml | 1 + kubernetes/apps/default/lms/ks.yaml | 1 + .../default/lychee/app/kustomization.yaml | 2 +- .../default/mailrise/app/kustomization.yaml | 1 - .../default/navidrome/app/kustomization.yaml | 2 +- kubernetes/apps/default/outline/ks.yaml | 1 + kubernetes/apps/default/resilio-sync/ks.yaml | 3 ++- .../default/sharry/app/kustomization.yaml | 2 +- kubernetes/apps/default/zigbee2mqtt/ks.yaml | 1 + kubernetes/apps/default/zwave-js-ui/ks.yaml | 1 + 25 files changed, 23 insertions(+), 82 deletions(-) delete mode 100644 kubernetes/apps/default/atuin/app/gatus.yaml delete mode 100644 kubernetes/apps/default/authelia/app/gatus.yaml delete mode 100644 kubernetes/apps/default/hajimari/app/gatus.yaml diff --git a/kubernetes/apps/default/atuin/app/gatus.yaml b/kubernetes/apps/default/atuin/app/gatus.yaml deleted file mode 100644 index d88df6b21..000000000 --- a/kubernetes/apps/default/atuin/app/gatus.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: atuin-gatus-ep - namespace: default - labels: - gatus.io/enabled: "true" -data: - config.yaml: | - endpoints: - - name: atuin - group: internal - url: 192.168.8.1 - interval: 1m - ui: - hide-hostname: true - hide-url: true - dns: - query-name: sh.${SECRET_CLUSTER_DOMAIN} - query-type: A - conditions: - - "[BODY] == 192.168.169.101" - - "[DNS_RCODE] == NOERROR" - alerts: - - type: pushover diff --git a/kubernetes/apps/default/atuin/app/kustomization.yaml b/kubernetes/apps/default/atuin/app/kustomization.yaml index 7a5a3fa1d..7b5540eb5 100644 --- a/kubernetes/apps/default/atuin/app/kustomization.yaml +++ b/kubernetes/apps/default/atuin/app/kustomization.yaml @@ -6,4 +6,4 @@ namespace: default resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ./gatus.yaml + - ../../../../templates/gatus/guarded diff --git a/kubernetes/apps/default/atuin/ks.yaml b/kubernetes/apps/default/atuin/ks.yaml index 172ff45af..f705da830 100644 --- a/kubernetes/apps/default/atuin/ks.yaml +++ b/kubernetes/apps/default/atuin/ks.yaml @@ -24,3 +24,4 @@ spec: postBuild: substitute: APP: *app + GATUS_SUBDOMAIN: sh diff --git a/kubernetes/apps/default/authelia/app/gatus.yaml b/kubernetes/apps/default/authelia/app/gatus.yaml deleted file mode 100644 index 93e0fdc70..000000000 --- a/kubernetes/apps/default/authelia/app/gatus.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: authelia-gatus-ep - namespace: default - labels: - gatus.io/enabled: "true" -data: - config.yaml: | - endpoints: - - name: authelia - group: external - url: https://auth.${SECRET_CLUSTER_DOMAIN} - interval: 1m - client: - dns-resolver: tcp://1.1.1.1:53 - insecure: true - conditions: - - "[STATUS] == 200" - alerts: - - type: pushover diff --git a/kubernetes/apps/default/authelia/app/kustomization.yaml b/kubernetes/apps/default/authelia/app/kustomization.yaml index b3598ff77..5aa5e533b 100644 --- a/kubernetes/apps/default/authelia/app/kustomization.yaml +++ b/kubernetes/apps/default/authelia/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization namespace: default resources: - ./externalsecret.yaml - - ./gatus.yaml - ./helmrelease.yaml + - ../../../../templates/gatus/external configMapGenerator: - name: authelia-configmap files: diff --git a/kubernetes/apps/default/freshrss/app/kustomization.yaml b/kubernetes/apps/default/freshrss/app/kustomization.yaml index 72f9ab807..48e972b27 100644 --- a/kubernetes/apps/default/freshrss/app/kustomization.yaml +++ b/kubernetes/apps/default/freshrss/app/kustomization.yaml @@ -6,5 +6,5 @@ namespace: default resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../templates/gatus/external + - ../../../../templates/gatus/guarded - ../../../../templates/volsync diff --git a/kubernetes/apps/default/freshrss/ks.yaml b/kubernetes/apps/default/freshrss/ks.yaml index 5db9b0971..6d6b427f2 100644 --- a/kubernetes/apps/default/freshrss/ks.yaml +++ b/kubernetes/apps/default/freshrss/ks.yaml @@ -25,4 +25,5 @@ spec: postBuild: substitute: APP: *app + GATUS_PATH: /i/ VOLSYNC_CAPACITY: 2Gi diff --git a/kubernetes/apps/default/hajimari/app/gatus.yaml b/kubernetes/apps/default/hajimari/app/gatus.yaml deleted file mode 100644 index 5d9772dc9..000000000 --- a/kubernetes/apps/default/hajimari/app/gatus.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: hajimari-gatus-ep - namespace: default - labels: - gatus.io/enabled: "true" -data: - config.yaml: | - endpoints: - - name: hajimari - group: internal - url: https://apps.${SECRET_CLUSTER_DOMAIN} - interval: 1m - client: - insecure: true - conditions: - - "[STATUS] == 200" - alerts: - - type: pushover - diff --git a/kubernetes/apps/default/hajimari/app/kustomization.yaml b/kubernetes/apps/default/hajimari/app/kustomization.yaml index 6d9428ee4..839d732b8 100644 --- a/kubernetes/apps/default/hajimari/app/kustomization.yaml +++ b/kubernetes/apps/default/hajimari/app/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: default resources: - - ./gatus.yaml - ./helmrelease.yaml + - ../../../../templates/gatus/guarded diff --git a/kubernetes/apps/default/invidious/app/kustomization.yaml b/kubernetes/apps/default/invidious/app/kustomization.yaml index f8c2e193c..c067a3946 100644 --- a/kubernetes/apps/default/invidious/app/kustomization.yaml +++ b/kubernetes/apps/default/invidious/app/kustomization.yaml @@ -6,4 +6,4 @@ namespace: default resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../templates/gatus/guarded + - ../../../../templates/gatus/external diff --git a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml b/kubernetes/apps/default/jellyfin/app/helmrelease.yaml index b7fcbc31b..2d8364e58 100644 --- a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml +++ b/kubernetes/apps/default/jellyfin/app/helmrelease.yaml @@ -87,6 +87,8 @@ spec: enabled: true className: "nginx" annotations: + external-dns.alpha.kubernetes.io/enabled: "true" + external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}. hajimari.io/icon: simple-icons:jellyfin hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" diff --git a/kubernetes/apps/default/jellyfin/ks.yaml b/kubernetes/apps/default/jellyfin/ks.yaml index 0c5c9ef3f..483d63834 100644 --- a/kubernetes/apps/default/jellyfin/ks.yaml +++ b/kubernetes/apps/default/jellyfin/ks.yaml @@ -26,4 +26,5 @@ spec: postBuild: substitute: APP: *app + GATUS_PATH: /web/index.html VOLSYNC_CAPACITY: 20Gi diff --git a/kubernetes/apps/default/kresus/ks.yaml b/kubernetes/apps/default/kresus/ks.yaml index fcb4f4b3d..3e679a7fc 100644 --- a/kubernetes/apps/default/kresus/ks.yaml +++ b/kubernetes/apps/default/kresus/ks.yaml @@ -26,3 +26,4 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi + GATUS_SUBDOMAIN: cash diff --git a/kubernetes/apps/default/libmedium/app/kustomization.yaml b/kubernetes/apps/default/libmedium/app/kustomization.yaml index b70c92613..7d8fc089e 100644 --- a/kubernetes/apps/default/libmedium/app/kustomization.yaml +++ b/kubernetes/apps/default/libmedium/app/kustomization.yaml @@ -5,7 +5,7 @@ kind: Kustomization namespace: default resources: - ./helmrelease.yaml - - ../../../../templates/gatus/guarded + - ../../../../templates/gatus/external configMapGenerator: - name: libmedium-configmap files: diff --git a/kubernetes/apps/default/libreddit/app/kustomization.yaml b/kubernetes/apps/default/libreddit/app/kustomization.yaml index 839d732b8..e147a8dec 100644 --- a/kubernetes/apps/default/libreddit/app/kustomization.yaml +++ b/kubernetes/apps/default/libreddit/app/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization namespace: default resources: - ./helmrelease.yaml - - ../../../../templates/gatus/guarded + - ../../../../templates/gatus/external diff --git a/kubernetes/apps/default/linkding/ks.yaml b/kubernetes/apps/default/linkding/ks.yaml index 5fb762299..8c9b329db 100644 --- a/kubernetes/apps/default/linkding/ks.yaml +++ b/kubernetes/apps/default/linkding/ks.yaml @@ -24,3 +24,4 @@ spec: postBuild: substitute: APP: *app + GATUS_SUBDOMAIN: links diff --git a/kubernetes/apps/default/lms/ks.yaml b/kubernetes/apps/default/lms/ks.yaml index 332d916ae..240bc6dc0 100644 --- a/kubernetes/apps/default/lms/ks.yaml +++ b/kubernetes/apps/default/lms/ks.yaml @@ -25,3 +25,4 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi + GATUS_STATUS: "401" diff --git a/kubernetes/apps/default/lychee/app/kustomization.yaml b/kubernetes/apps/default/lychee/app/kustomization.yaml index c5e641ed5..d60d6391e 100644 --- a/kubernetes/apps/default/lychee/app/kustomization.yaml +++ b/kubernetes/apps/default/lychee/app/kustomization.yaml @@ -7,5 +7,5 @@ resources: - ./externalsecret.yaml - ./helmrelease.yaml - ./sync - - ../../../../templates/gatus/guarded + - ../../../../templates/gatus/external - ../../../../templates/volsync diff --git a/kubernetes/apps/default/mailrise/app/kustomization.yaml b/kubernetes/apps/default/mailrise/app/kustomization.yaml index 7b99e2c4f..015a58b27 100644 --- a/kubernetes/apps/default/mailrise/app/kustomization.yaml +++ b/kubernetes/apps/default/mailrise/app/kustomization.yaml @@ -6,7 +6,6 @@ namespace: default resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../templates/gatus/guarded configMapGenerator: - name: mailrise-configmap files: diff --git a/kubernetes/apps/default/navidrome/app/kustomization.yaml b/kubernetes/apps/default/navidrome/app/kustomization.yaml index 35ff57401..3170b928d 100644 --- a/kubernetes/apps/default/navidrome/app/kustomization.yaml +++ b/kubernetes/apps/default/navidrome/app/kustomization.yaml @@ -5,5 +5,5 @@ kind: Kustomization namespace: default resources: - ./helmrelease.yaml - - ../../../../templates/gatus/guarded + - ../../../../templates/gatus/external - ../../../../templates/volsync diff --git a/kubernetes/apps/default/outline/ks.yaml b/kubernetes/apps/default/outline/ks.yaml index 8b4181658..2afaa51da 100644 --- a/kubernetes/apps/default/outline/ks.yaml +++ b/kubernetes/apps/default/outline/ks.yaml @@ -25,3 +25,4 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi + GATUS_SUBDOMAIN: docs diff --git a/kubernetes/apps/default/resilio-sync/ks.yaml b/kubernetes/apps/default/resilio-sync/ks.yaml index 80e8d48b9..3d91d6036 100644 --- a/kubernetes/apps/default/resilio-sync/ks.yaml +++ b/kubernetes/apps/default/resilio-sync/ks.yaml @@ -26,7 +26,7 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi - + GATUS_STATUS: "401" --- # yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 @@ -55,3 +55,4 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi + GATUS_STATUS: "401" diff --git a/kubernetes/apps/default/sharry/app/kustomization.yaml b/kubernetes/apps/default/sharry/app/kustomization.yaml index 2ed28ff03..9297acaaa 100644 --- a/kubernetes/apps/default/sharry/app/kustomization.yaml +++ b/kubernetes/apps/default/sharry/app/kustomization.yaml @@ -6,7 +6,7 @@ namespace: default resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../templates/gatus/guarded + - ../../../../templates/gatus/external configMapGenerator: - name: sharry-configmap files: diff --git a/kubernetes/apps/default/zigbee2mqtt/ks.yaml b/kubernetes/apps/default/zigbee2mqtt/ks.yaml index 7973af919..dc580f6f2 100644 --- a/kubernetes/apps/default/zigbee2mqtt/ks.yaml +++ b/kubernetes/apps/default/zigbee2mqtt/ks.yaml @@ -27,3 +27,4 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi + GATUS_SUBDOMAIN: zigbee diff --git a/kubernetes/apps/default/zwave-js-ui/ks.yaml b/kubernetes/apps/default/zwave-js-ui/ks.yaml index 58048824f..ed3c5f940 100644 --- a/kubernetes/apps/default/zwave-js-ui/ks.yaml +++ b/kubernetes/apps/default/zwave-js-ui/ks.yaml @@ -27,3 +27,4 @@ spec: substitute: APP: *app VOLSYNC_CAPACITY: 2Gi + GATUS_SUBDOMAIN: zwave