From d97c36f42f03e96758c79459eeca6aafead0b0e8 Mon Sep 17 00:00:00 2001 From: "azykov@mail.ru" Date: Mon, 20 Jul 2026 22:19:48 +0300 Subject: [PATCH] radicale namespace changed to pim --- clusters/base/apps/radicale/configmap.yaml | 2 +- clusters/base/apps/radicale/helmrelease.yaml | 4 ++-- .../base/apps/radicale/helmrepository.yaml | 4 ++-- clusters/base/apps/radicale/secret.enc.yaml | 22 ------------------- .../base/apps/vaultwarden/secret.enc.yaml | 18 +++++++-------- .../base/apps/zigbee2mqtt/secret.enc.yaml | 16 +++++++------- .../namespaces/{radicale.yaml => pim.yaml} | 2 +- clusters/home/namespaces/kustomization.yaml | 2 +- 8 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 clusters/base/apps/radicale/secret.enc.yaml rename clusters/base/namespaces/{radicale.yaml => pim.yaml} (70%) diff --git a/clusters/base/apps/radicale/configmap.yaml b/clusters/base/apps/radicale/configmap.yaml index b5672c7..28240a6 100644 --- a/clusters/base/apps/radicale/configmap.yaml +++ b/clusters/base/apps/radicale/configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: radicale-config - namespace: radicale + namespace: pim data: # storage.hook (the git-commit-per-change hook in the old compose setup) # called out to a webhooks sidecar that isn't part of this deployment yet, diff --git a/clusters/base/apps/radicale/helmrelease.yaml b/clusters/base/apps/radicale/helmrelease.yaml index 582c02e..b44266b 100644 --- a/clusters/base/apps/radicale/helmrelease.yaml +++ b/clusters/base/apps/radicale/helmrelease.yaml @@ -2,9 +2,9 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: radicale - namespace: radicale + namespace: pim spec: - interval: 30m + interval: 10m chartRef: kind: OCIRepository name: app-template diff --git a/clusters/base/apps/radicale/helmrepository.yaml b/clusters/base/apps/radicale/helmrepository.yaml index f692354..886fd8d 100644 --- a/clusters/base/apps/radicale/helmrepository.yaml +++ b/clusters/base/apps/radicale/helmrepository.yaml @@ -2,9 +2,9 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: app-template - namespace: radicale + namespace: pim spec: - interval: 1h + interval: 10m url: oci://ghcr.io/bjw-s-labs/helm/app-template ref: tag: "5.0.1" diff --git a/clusters/base/apps/radicale/secret.enc.yaml b/clusters/base/apps/radicale/secret.enc.yaml deleted file mode 100644 index 1adb9ca..0000000 --- a/clusters/base/apps/radicale/secret.enc.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: radicale-secrets - namespace: radicale -stringData: - users: ENC[AES256_GCM,data:gJUv/Nx6aHAYVQ6LrAdN/v+2dxfghjPS3XuOReDOU6SjBOTp5zY574W9iLib+L/emB6dNq5LZlZO7mZSYFEZjvoUfZ+H0IPJ5Gy1P3vSg0mfamPYiKsB87rPm+dZ8lVibOL2tCJxmpxhSDY8ZlyJlhjVhZGwr8nGZJlWirPtSF1IJAl00pwB2w==,iv:EjKX4FEQZD+tdCd7BeO0jY0JU68aGxXx8UGnYCcJAmo=,tag:uhYlWuCUpMvZsGT2FuxTWw==,type:str] -sops: - age: - - recipient: age1nqjekn6qk8uqunyv5cl88nx9g3y8a94h5qr0u53q5dsdsmhr7g2syy6fsd - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyN0IwOVozUDdJRmlEc1E0 - aGt4SVlMSkxyK0hYckx2cnhQUnpLMlhlSzNNCkx0OTlLcVpjcFExMlQ3UzAyNEov - OUxIbktSUldKdGRtL0RIWDl5U3YxREEKLS0tIFhwNlFNelZZWmNjeHZTeGRlcXgx - bm9aeHczRVNUd3cvWUNqazljTVlLM2cKC1qnh/YmwMWdKGTyEOKm1e7xg7d7SNRJ - ODbixSN68fYSQA7ltpU2m+XX6UXwDtqlGXtVgDAgijIdJ+utRdf/qQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-08-26T10:17:59Z" - mac: ENC[AES256_GCM,data:ZAr33UhY7TLezoUxATpxtx7Z3DWmCqVVW83y1GoAqVGrsl6AxiG/snImyEV5h11Wz/43VMMGsztM2/nTz4VKq94vfhB3bjrGPz6zR7yNLzd8q2A2L87s1fnHBURA00qIgr7bGLEau6wV19Go56oaAi9HfAgqPIQEtIqWDGA82hg=,iv:42C3snMyuJCl/yUxbT4ScqIDxU55NLr4gQY0BR5slSk=,tag:tOSLKPT6ShjAgh3jw0t1Zw==,type:str] - encrypted_regex: ^(data|stringData)$ - version: 3.11.0 diff --git a/clusters/base/apps/vaultwarden/secret.enc.yaml b/clusters/base/apps/vaultwarden/secret.enc.yaml index 60afac7..8c3c025 100644 --- a/clusters/base/apps/vaultwarden/secret.enc.yaml +++ b/clusters/base/apps/vaultwarden/secret.enc.yaml @@ -4,20 +4,20 @@ metadata: name: vaultwarden-secrets namespace: vaultwarden stringData: - #ENC[AES256_GCM,data:z0Fia5DUYnKz0Q+Wkk4gXYXqjvk1uLVN4H2yGp8X9GX038xwFbNmNbgarD941sWLruXo2S9egjOx,iv:7pa/4tbSfM0IFCI5+mnj0P6zVBkUNvbvH1hhP+GwaCE=,tag:/TJhlDAIZpZfmiLxr6vr1g==,type:comment] - ADMIN_TOKEN: ENC[AES256_GCM,data:eZHoFX2aBkELSPTqhmwSWvgkK4wytQDdFvV5xfh/lppBMqUrUSRgx1kPICca4efvAAlxQ1Eq3IJ7ZiZ32tOIxpkQ/Bt25fKMFqY13QFDKpalXJATlcpMRoAj50Y3umEv3ucxZP4muuHRSLJ6OG9Hn9lvnfgLEw==,iv:nzLKFOzaqbnhdVBoKhTlkF8nuu9hnk2lFzxjpGM3Tns=,tag:8tKqWezUDcCbBFJ3xLAd4g==,type:str] + #ENC[AES256_GCM,data:1iy2zqCUdVLoHO6o+TRPdIQe8NQZ8JdPFVKKvCpNsNo/MH9gh0ALH0pGFp0cTISttBlaLAGwsteO,iv:wqUfrnaTXUUZZZD9jl6NY5zatSJy1NwTeWAyt0bVspk=,tag:JSYQu8BOwvPw7ItMmdlFug==,type:comment] + ADMIN_TOKEN: ENC[AES256_GCM,data:eRv0deLFXgqjZ+GoDF6YomX/hQSfaEzuXBegJ0aN+7dqrjC5kFsFdETyypV1DLjbohla1jh6487slnL1LPV7EQeEGpE9E0Yv/N1XiHTvJQV1akIVyYLsaT/c69ByAlVNFCXzPtNk+BZq1e9TTDLrlt5VtdEeIw==,iv:yT5HnkoPXtnqMOE/p2040Are0NIQQswGZ8v9jGp6/RA=,tag:1h/PgReAl9uU6NpUD2Z7Vw==,type:str] sops: age: - recipient: age109zta6l0cwpkxn5wek82kvauxn6yqrq80rsz4mvu5atdnpcn9pusuvnqk5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOT282MzJvSjNJNFlPOThs - MmdncVZWV2lnZUZNMEtlSmQ0SXV5NG40UUFjCmZkZ2wwb0d1aEltSEVvMDhaT2l4 - SU5nU2JncE1yS1ZITzlPaVFFZTEycWsKLS0tIHpWSDY3dzBOZ1NraTNqTDlqaTl6 - RjNnT1hKSWdteUtxTTFtL1pRVmd0MHMKJ0085ot92zhLB7U168XpRP+kmeSF6FMg - fLePA/41EcdeSURLcfp0eHn+GCdE1RR6iN8xl0FgC1I5s3eo0eRqBQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmd2w1aldSOWxKZDlodVlt + Smw4VE1KamIxRnVXS1BRb0Q4RHJIZEcyNUdJCjNpYnBZajlKNDR3VVdzUXBrNEVp + aUdjeXBTUWg3bmR6SmNMOXdYbHpJSkEKLS0tIGRlNlVIYzNoTVB2YzdQVytXZHdN + TmJuV0U2QmhqMW5HVEZjNVVXaWRDTDgKFTLto4FppZxSzrGZVtFPQl2XJk0PqUWO + Ti2NL6GgvnLuslr6Yg3CQANh1BcuQgeczLxyWVG45daqJisL0ocejQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-08-26T10:18:00Z" - mac: ENC[AES256_GCM,data:uh21zjey87nLhNbPp5cXruUyPVIByKuUEErOP+oQ8ovGMWLZvg/zPzWqVu0mdDHA3FnrpPBwfgupPLHc3h/SnGwlPnJjJMsLoy8l94iL46OLo0DdGNRYVkG+rLXzk2AfZL43x4v2O6RIwPaJPybCohz/0uDc4B6bYYOiPuzCOHg=,iv:jaRmxJYoV+5vV7daNnFTOs4Kr+zptONwMDhe1uSi0nw=,tag:gQ39mdvd7miDLcAr3VWN5w==,type:str] + lastmodified: "2026-08-26T10:18:03Z" + mac: ENC[AES256_GCM,data:nZJ3VUKb2vQUhODAVbYwZXdsdlv/brOgPXLrD6cmLkLTr1pDbl/00+N9lfJquDhW3buZ2qiDLo+i/x/jerihtvt+qbi8PfgpRvA7H9KEJakaLYqD8892Pm2ikjDbRAwAG3AMpikTlyv/a2OTXnXjCjz7m8O3FLcqAyo4t9a1+CI=,iv:M2bzP9tOTsZ2VIHRkhaF/I0XKiVYFfx++htYwn2b4OI=,tag:Pq8iQ4bi1uGBehZE50cx7w==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.11.0 diff --git a/clusters/base/apps/zigbee2mqtt/secret.enc.yaml b/clusters/base/apps/zigbee2mqtt/secret.enc.yaml index f5bac13..4f79830 100644 --- a/clusters/base/apps/zigbee2mqtt/secret.enc.yaml +++ b/clusters/base/apps/zigbee2mqtt/secret.enc.yaml @@ -4,19 +4,19 @@ metadata: name: zigbee2mqtt-secrets namespace: zigbee2mqtt stringData: - secret.yaml: ENC[AES256_GCM,data:AmNVAfl3DBGFEZravLSXSnHxo0EE8XvFZ84XOa9mqLCxsO/TG9FXIf//zsKSNJKvA/ZxOcd/yna5PWcLbAkVaNtMMG3Ck00Lx+oTLGV5GNq7VEQOLVqlJaWex4MGQWXvVM1uzd5cjQX8a29WCqqCSfj5E/Rt1xt+M8C4G2U=,iv:jUn/07DDOCEyLKp39w3Ge8uqCPbk6BXlUxzumRX2SSA=,tag:vKUsgnjzGvJCqY5Rv6Lnrw==,type:str] + secret.yaml: ENC[AES256_GCM,data:GUqLRP9jsIjhk1VjRlBS0RGpcv6gFSV/o26hQ40pGXCeIsD9uDpGR6inADDR0shni0cfzqfqbUyBT1vBaGH1gaBg/QgzFaviSUZGVOZK0vl+8DrD1BMNCcVlNU3/arLrRyIp4a87CAh5cRjbfpPYlcNyi4f+6rsNn7D1uMU=,iv:/NmYgFuq+SWr//dsM2m/i2s1FjGeCi0/XAxANFlZiYU=,tag:XF6YWPGfQr5t63pVhOkphg==,type:str] sops: age: - recipient: age1tu4xgfefvgdda0vn2thaqndq4p9tuydq2ud6qa98tzzgnff6749qnlcx29 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5TnBTTStBbkJScUlwRDVX - K21YZ3hTYmN6cmg2UVVLamJLMERNTUtnZUhnCmdsNTF2eW81NXlQTkxsQ1JrZkZh - ZFVFNVppeThEN2xiMnRwK2RLUmhqTkUKLS0tIHNOMk02VThsczUzejFSZWQ4ZWpO - SXd6SXFvOXMzTU5qRjJnUlh4b3RlVTgKzazMLtTnSvq+S3y0ct/6edoYPXB7L0Rq - 1m6BX7LMcG3Zz6cp/LUI/CplywhXmPAINSTNszHkCAr5/ww9xrfOWg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMR3RHQjlhL3YwNUpKRDB1 + cnZuL0x4dkdxTm1nWnJJbkZhNDZXaTA4YVUwCkZtV2x4eDRrbktTTWZSZ2xtUnRE + UU9ISkVjdVhWSjZhZkw0aFl1ZnMveWsKLS0tIDNqVXB3clBJcU51alFUdjZ2YVV3 + ZTJ1NDRUNGNINnY0OUVxN3VLUWJYV1EKTB0N7A3ZGLAO62FwUiuYF+4BXHknTDKl + FqfhXDqbj0F4rS216ISBVB7k4kZyM5PjlVUW8FDwIJYoZKRqdhBUWg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-08-26T10:18:00Z" - mac: ENC[AES256_GCM,data:9pOaHVtQywXAVVTlU7kOpF3fkOGIpKAL/kxCj7cGpRLXB9pzViyI6KaMWrUHxIQeNVPnhtvde8qI/rKJly8iBng9gvyW+gQopgZxnKbWd2fQ61vJfpOVq4C/MrV7VqbYWFRnIa/KDjYJxTnwLhTepvPofLKT4QiJEIr+j6mEh88=,iv:O+ZieVZU1SiCJ64MLh7OH3TDn3onp2SmfEpY0ZW6EvA=,tag:VcE2O2T+ebRMgEkuWLtGGQ==,type:str] + lastmodified: "2026-08-26T10:18:04Z" + mac: ENC[AES256_GCM,data:amIh+6TF8ry59ToPNRE+eOUXh+gB42nMOMaRDcO4z1zGCbG3f2FP2wmfYanpGy09OJ6xnNXhQqpXh7/c30buprXXT0SL0d9VNqBwCQ8RGI3wD2BsK5Udi0TB70tuOETQlpdW2ADQXM3pN+NgNI9AhMy8p+Q+FGNVO7YIV7afAlM=,iv:VCBjHftr73XdI1JKP6Ix9/6b9mE7+0jAuvtz4rne4iw=,tag:scmtgGan3RY968v9bQ7AOg==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.11.0 diff --git a/clusters/base/namespaces/radicale.yaml b/clusters/base/namespaces/pim.yaml similarity index 70% rename from clusters/base/namespaces/radicale.yaml rename to clusters/base/namespaces/pim.yaml index 899b712..47a6074 100644 --- a/clusters/base/namespaces/radicale.yaml +++ b/clusters/base/namespaces/pim.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: radicale + name: pim diff --git a/clusters/home/namespaces/kustomization.yaml b/clusters/home/namespaces/kustomization.yaml index f8d230e..628ebdf 100644 --- a/clusters/home/namespaces/kustomization.yaml +++ b/clusters/home/namespaces/kustomization.yaml @@ -3,4 +3,4 @@ kind: Kustomization resources: - ../../base/namespaces/vaultwarden.yaml - ../../base/namespaces/zigbee2mqtt.yaml - - ../../base/namespaces/radicale.yaml + - ../../base/namespaces/pim.yaml