From 4f76807824b4463637ed8c65b7476193e4582078 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Mon, 15 Dec 2025 00:50:42 +0100 Subject: [PATCH] chore: Moved telegram alerts config --- clusters/testing/kustomization.yaml | 2 +- .../telegram}/alert.yaml | 0 .../telegram/alerts-telegram.yaml} | 4 +- .../telegram}/kustomization.yaml | 2 +- .../telegram}/provider.yaml | 0 .../telegram/secret-telegram.enc.yaml} | 0 configs/artifacts.yaml | 4 +- .../telegram-alerts/secret-telegram.enc.yaml | 52 ------------------- 8 files changed, 6 insertions(+), 58 deletions(-) rename configs/{telegram-alerts => alerts/telegram}/alert.yaml (100%) rename configs/{telegram-alerts/telegram-alerts.yaml => alerts/telegram/alerts-telegram.yaml} (85%) rename configs/{telegram-alerts => alerts/telegram}/kustomization.yaml (78%) rename configs/{telegram-alerts => alerts/telegram}/provider.yaml (100%) rename configs/{telegram-alerts/secret-telegram.yaml => alerts/telegram/secret-telegram.enc.yaml} (100%) delete mode 100644 configs/telegram-alerts/secret-telegram.enc.yaml diff --git a/clusters/testing/kustomization.yaml b/clusters/testing/kustomization.yaml index bbff85c..63a30d5 100644 --- a/clusters/testing/kustomization.yaml +++ b/clusters/testing/kustomization.yaml @@ -13,5 +13,5 @@ resources: - ../../configs/artifacts.yaml - ../../configs/letsencrypt/letsencrypt.yaml - ../../configs/certificates/certificates.yaml - - ../../configs/telegram-alerts/telegram-alerts.yaml + - ../../configs/alerts/telegram/alerts-telegram.yaml - ../../configs/longhorn-jobs/longhorn-jobs.yaml diff --git a/configs/telegram-alerts/alert.yaml b/configs/alerts/telegram/alert.yaml similarity index 100% rename from configs/telegram-alerts/alert.yaml rename to configs/alerts/telegram/alert.yaml diff --git a/configs/telegram-alerts/telegram-alerts.yaml b/configs/alerts/telegram/alerts-telegram.yaml similarity index 85% rename from configs/telegram-alerts/telegram-alerts.yaml rename to configs/alerts/telegram/alerts-telegram.yaml index 3ec8852..9a64a5f 100644 --- a/configs/telegram-alerts/telegram-alerts.yaml +++ b/configs/alerts/telegram/alerts-telegram.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: telegram-alerts + name: alerts-telegram namespace: flux-system spec: interval: 1h @@ -9,7 +9,7 @@ spec: timeout: 5m sourceRef: kind: ExternalArtifact - name: telegram-alerts + name: alerts-telegram decryption: provider: sops secretRef: diff --git a/configs/telegram-alerts/kustomization.yaml b/configs/alerts/telegram/kustomization.yaml similarity index 78% rename from configs/telegram-alerts/kustomization.yaml rename to configs/alerts/telegram/kustomization.yaml index 240ac7a..854fcfb 100644 --- a/configs/telegram-alerts/kustomization.yaml +++ b/configs/alerts/telegram/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - secret-telegram.yaml + - secret-telegram.enc.yaml - provider.yaml - alert.yaml diff --git a/configs/telegram-alerts/provider.yaml b/configs/alerts/telegram/provider.yaml similarity index 100% rename from configs/telegram-alerts/provider.yaml rename to configs/alerts/telegram/provider.yaml diff --git a/configs/telegram-alerts/secret-telegram.yaml b/configs/alerts/telegram/secret-telegram.enc.yaml similarity index 100% rename from configs/telegram-alerts/secret-telegram.yaml rename to configs/alerts/telegram/secret-telegram.enc.yaml diff --git a/configs/artifacts.yaml b/configs/artifacts.yaml index 96119a6..352689a 100644 --- a/configs/artifacts.yaml +++ b/configs/artifacts.yaml @@ -19,10 +19,10 @@ spec: copy: - from: "@foundation/configs/certificates/**" to: "@artifact/" - - name: telegram-alerts + - name: alerts-telegram originRevision: "@foundation" copy: - - from: "@foundation/configs/telegram-alerts/**" + - from: "@foundation/configs/alerts/telegram/**" to: "@artifact/" - name: longhorn-jobs originRevision: "@foundation" diff --git a/configs/telegram-alerts/secret-telegram.enc.yaml b/configs/telegram-alerts/secret-telegram.enc.yaml deleted file mode 100644 index 959244a..0000000 --- a/configs/telegram-alerts/secret-telegram.enc.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: v1 -stringData: - token: ENC[AES256_GCM,data:azBE1dVSbYNZzpagsQrmEoYGIGFn/URQ3VrksQRhUKuJyCrc6o6360u/k38NKg==,iv:iYpqz6Ndh5QESa8yGPU1nKD8/sb3dgloNLa3HFDihnU=,tag:2w0eslkZQOIb+qPYgNmHIQ==,type:str] -kind: Secret -metadata: - name: telegram - namespace: flux-system -sops: - age: - - recipient: age1860txadrlqrjwnqh0g466re2nt8jk7xhj640pq9gpsddpg23uynqsp2hul - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtNmJhYUtTYnNRcTlvaXFE - WHNsWFVrUDMrZzUyTHJ4WGJTOU4rL29pRmtZCkNqRGVYa0hOWWljSThsUHlDSnVD - UGpBcS9UZDU2Q2NMOEtCaC9qcnREY0EKLS0tIERpQ01LVnh5dm5wRjFnUVlXWmxr - OUYvK29RUXNjeE02Q1l6TDZaNzhSNG8K5JPUi2txe31/cgLF0+WnEDmSpgDhMGdv - CDP4b7O0VpN32sE3t19cFeuZ38oS/kn0d4Lsw4eu7L+uuZheq2PN0Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1hktythzvsnth6u5en2lvag0tftnj9r03w7rpnzfgzgf5w95qxycq2azufj - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5MkJOdlF2YVVES3ZnTm1t - QXJLSUF6OWJrWmhOamVOK2JOY2lWdXFxT1h3CnRkOHpCY2dRU2xLRzdCKzVHY2R3 - ZUdBTldwWVRYNkN0SUpiQjJTL2h5UzQKLS0tIEpXTWRNbTh2YW13V0psVzU0Zkxo - RE5SSzI4MmdOWGhBTGNzR2NPeHArSHcK8sOiSL6tfAT6KFLkFy0NpRuiVbFayJPR - vtki2eku7b0MKsQKCv/JPwSdOa7q/8Mxngiajxqwae0nObETSR+2TA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-09T02:34:49Z" - mac: ENC[AES256_GCM,data:dwt7iU5FQjd3Hn/ynE+hAv6L6/EwGgJ9KR/98RsGL+ZoDOXrcnPu8I1Zp4HIuwxzLQetYPeeZy0qGl452eWnbI8kJ2MySGGpqdYeJVWplyfx3pSMT5ms7gbHYTAS7Kp8VLPtzynyKA14fJZNiECd/onVJehxE5bEtKEuiE7ZRvE=,iv:nc59zZeHLtwjsrCOI/WgQc7ZXKXI+5/Q2QcIdBVI+RQ=,tag:xdrCwPDVA1im+cNwPgU6Lg==,type:str] - pgp: - - created_at: "2025-12-09T02:34:13Z" - enc: |- - -----BEGIN PGP MESSAGE----- - - hQIMA51kG++kLewoARAAxzvoy2eJdqO5p12H8PzOqp6viq2c6G8VGULDOOWUk7VG - DTfzEjOTjnGooz1dMHb0MdYGm5DVyuxp+6AW/i5XZmPSiV1fWuROUFaf9qb+EcVS - mq7Csor0MKbQAns2C7xWe1AZq73AL1cXsWAWOvNuAKnP510nLds08FHAUhirylkl - X2Jv/xys+gaY/XpyvkIPyRKfCfO1IzwjHy1OiIkvx+QZWaEjm5psP262ckZlMl+R - nf3rF/ZNzyo2Nli1wnUPKtcCXanfZXuDadgUlc+9ISMB2UEFlUC8lvQngXPwTdmN - etXYvy/OI2Hyx5ynVvewAGLSHhwOlCjH7/6xGvTOhFzVsi/Tk4TsJTKZu25/j0Jy - pgZ/WNPQegq0o/vxxiyU+OJdDv8SDew6f5mjgfD1wikvMDBBgW3TLrNnlQMqSPpr - KSLLlgkLkie21F0YVlDh3MK5MDWySZC6VZfuD/kZIpsqeatka3IRDsRRvFV6teGM - cJ1eNFRDAXnI9GB8KpuRH9sYLVzgQdmLBfP8ksadci/ykjtQp/92mwf7nMThT+09 - cYG36Y8G5HCly0ZdY+Zl1Evw43W8vp5Va5Zc8EWvz51kk03gQd7jlOjGFgCarSOv - w3jKC1CUVKQi+JIfeufYb6vPWvYWJKTvP2yikw46nwoHkPixeRhelR27qWLWu3jS - XAF+wgVNKSJPC94eVbRBjpj51IN/gyj051ria/uw++Z8SuHVGiqT1B+gTd6pyVSU - cHGRCPkIC0g75q9Fgmxfob9hAkybGxJ+fWOzBTpmnzG+1VScNAYTbyXiOFVo - =fVSN - -----END PGP MESSAGE----- - fp: CD17A34CBFB21DE9A73D47EB76BDEC4E165D8AD9 - encrypted_regex: ^(data|stringData)$ - version: 3.11.0