From fe3e885b3344c92aaf0b9f1af6293df951a065ec Mon Sep 17 00:00:00 2001 From: "azykov@mail.ru" Date: Tue, 21 Jul 2026 12:04:43 +0300 Subject: [PATCH] longhorn-retain -> longhorn, longhorn -> longhorn-no-retain --- clusters/base/apps/radicale/helmrelease.yaml | 2 +- .../base/apps/vaultwarden/helmrelease.yaml | 2 +- clusters/base/apps/vaultwarden/secret.enc.yaml | 18 +++++++++--------- .../base/apps/zigbee2mqtt/helmrelease.yaml | 6 +++--- clusters/base/apps/zigbee2mqtt/secret.enc.yaml | 16 ++++++++-------- .../kustomization.yaml | 14 -------------- .../kustomization.yaml | 0 .../storageclass.yaml | 6 +++--- clusters/home/infra/kustomization.yaml | 3 +-- .../infra/storage-class-local-path-patch.yaml | 13 ------------- ...l => storage-class-longhorn-no-retain.yaml} | 2 +- 11 files changed, 27 insertions(+), 55 deletions(-) delete mode 100644 clusters/base/infra/storage-class-local-path-patch/kustomization.yaml rename clusters/base/infra/{storage-class-longhorn-retain => storage-class-longhorn-no-retain}/kustomization.yaml (100%) rename clusters/base/infra/{storage-class-longhorn-retain => storage-class-longhorn-no-retain}/storageclass.yaml (65%) delete mode 100644 clusters/home/infra/storage-class-local-path-patch.yaml rename clusters/home/infra/{storage-class-longhorn-retain.yaml => storage-class-longhorn-no-retain.yaml} (78%) diff --git a/clusters/base/apps/radicale/helmrelease.yaml b/clusters/base/apps/radicale/helmrelease.yaml index d21a6a9..b44266b 100644 --- a/clusters/base/apps/radicale/helmrelease.yaml +++ b/clusters/base/apps/radicale/helmrelease.yaml @@ -69,7 +69,7 @@ spec: type: persistentVolumeClaim accessMode: ReadWriteOnce size: 1Gi - storageClass: longhorn-retain + storageClass: longhorn retain: true globalMounts: - path: /data diff --git a/clusters/base/apps/vaultwarden/helmrelease.yaml b/clusters/base/apps/vaultwarden/helmrelease.yaml index 83010a2..8335a98 100644 --- a/clusters/base/apps/vaultwarden/helmrelease.yaml +++ b/clusters/base/apps/vaultwarden/helmrelease.yaml @@ -59,7 +59,7 @@ spec: persistence: data: type: persistentVolumeClaim - storageClass: longhorn-retain + storageClass: longhorn accessMode: ReadWriteOnce size: 2Gi retain: true diff --git a/clusters/base/apps/vaultwarden/secret.enc.yaml b/clusters/base/apps/vaultwarden/secret.enc.yaml index b860249..202e20b 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:9WyLVqwsScR1VkiPoqzDpizcJPfqTowWaPEB5GCS/w9wrqem+J5IBToJHj/vODCYD2MoB45hjnaU,iv:Nr5DEiHoU9vLWivhqHKgCg1eyYiuwKhzn90PezIJi6Q=,tag:+Vt2at+aYKwfaRxWDAFVRg==,type:comment] - ADMIN_TOKEN: ENC[AES256_GCM,data:3zyG3yfBagQHqvfwbh6LDpbB2bc2sP4NJd85HRXPWaLFiLVOOjljeZgZDqQmUhwyokL5dq1W+Quq5HvmlL6PffwMAUCsgFB0EPyTfXEsuiiRFJn+9gPhdDBL1FM44tAUZyFGcbDK17O/0Qvsw8IiQUWoL5X7PA==,iv:5EX1opagPitjRLaB/T9a2o79ir+H/HGbxb1ev0qPAlk=,tag:eZgaoVGsJ0sJWsEE3T42GQ==,type:str] + #ENC[AES256_GCM,data:0pyGYd1d1eJEINKxqUIxdgdc2pYCxY+flJ7sdfEdloOcdtfrY6z4nk6PQ0gMUWj0e/FpKTmITJEK,iv:7bwlpzDiAYfhAHIT59G0IJcEMe9yb1pnWN0y9rHs/NA=,tag:fYOr4mlezaydkWZz24/Vww==,type:comment] + ADMIN_TOKEN: ENC[AES256_GCM,data:Wn8PpV4NbJ4t2nJbdUdvJsk31AoT/ib8xYG2hs+8e3Uoke3WRjVmxp5RENC7rwYSfB2g/46a/lg/ABs28vBhwxvRBewbbkf1ZatdL4znkeS1kyiNJTZJ8SXDqBwCjFeZBTdBQUcuTATYdw7Zq2SRu5tmTLFWQA==,iv:8l8r/V+OfEauJxOMPosyRD+DKclD3aWWgXKFarkPWHY=,tag:Db/36TSen8zWRVwq/DZwTw==,type:str] sops: age: - recipient: age109zta6l0cwpkxn5wek82kvauxn6yqrq80rsz4mvu5atdnpcn9pusuvnqk5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzMldFL3FpZmZ1VDVXNENj - c3FkQmo3Q24veG1MRXQvNEJjbHR2OG5WcWdBCkJRbDVEWmxkN2lVSGhVUmRCb0sv - dlBLSXhOT3FFSE9vaUw4anFKL1pCOEUKLS0tIGpTRjVEY3F2L2tpU29uVWZlQTk2 - V01hR0J0MXVtcXoweC9ma1lUTDZUV2MKm3MDjwYvtxbir6ANeWzEjgqe4bj8OeiT - nAfwNCGpi45biVTfvitusgdflpREoHXkgpDpQkjOjvUC52FDA8maJw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4cFpaSmxwczRMY0ovWkg0 + UUdYMzN5YndCVmM4R2IrUGJ3U1J3RlJ2RkR3CmNLVFhsaXo3anJ6WUlUMWdqaVJ0 + Vjl0K2I3RndBUC9QNUFzMk9VclE1RGcKLS0tICsrWUhwVlB6ak1IQy9peE9nRzhW + dFYxY0xoRlNrd0w2ZE9RTTFaZHc3dEUKqS9q9k5dNmRAGl3k8/63R7XAq3LgxIzX + hJZetWJ5aKJF7+cqCFYUNGQA0qhlXinJnL7T0WBRLmzdCWCuW8Ha9Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-08-26T10:18:13Z" - mac: ENC[AES256_GCM,data:309NreQ1N3CDZt6rLjKp1jUUGBGsFu2aF+RWMT+gO76APd62z4AIP+6D+vUv1kD9XWDHVnYmWFG+fMEnVnoQtwmJcJYcaFRexKObTAuik1/XyZcOBlb0c9zRZUn1US+HygnzdVtJv0hEaJasnmcQwWOBeqwF1E4YYL2S54C3MSk=,iv:FomstXxurBhLA7TX0lGTqm5hMJytUgrvWcJvofSIuNU=,tag:6B8uYVAo0Rf6SNROLCy7zg==,type:str] + lastmodified: "2026-08-26T10:18:17Z" + mac: ENC[AES256_GCM,data:lQoTx/7t3iUxDV6VvzTn2uDg4HgB2OZYdaA4LmAY320uI+bHjMuLEtWe6Ing1Oa/vdQCLGTj3RxXXMCl+9Nk4PdnZ/lPAqh0mSwlCWwZZOnbRHqrNgzbrEa+nyKPfIZSEQSZJi9AMNDq0MpCzuwDfJlDPl/6dhRe/qZqSOt/8io=,iv:2o6QNFWALTdeHn2uyAoQAmEQxlVnMog+v/bcnxQ4XZo=,tag:GE7xRyoDlmWVujs5lK6KsA==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.11.0 diff --git a/clusters/base/apps/zigbee2mqtt/helmrelease.yaml b/clusters/base/apps/zigbee2mqtt/helmrelease.yaml index 90e18f3..6255a63 100644 --- a/clusters/base/apps/zigbee2mqtt/helmrelease.yaml +++ b/clusters/base/apps/zigbee2mqtt/helmrelease.yaml @@ -21,7 +21,7 @@ spec: storage: enabled: true size: 1Gi - storageClassName: longhorn-retain + storageClassName: longhorn secrets: name: zigbee2mqtt-secrets @@ -44,7 +44,7 @@ spec: mqtt: server: "mqtt://mosquitto.mqtt.svc.cluster.local:1883" user: iot - password: '!secret.yaml mqtt_password' + password: "!secret.yaml mqtt_password" include_device_information: true keepalive: 60 reject_unauthorized: true @@ -65,7 +65,7 @@ spec: channel: 11 pan_id: 7410 ext_pan_id: [46, 22, 201, 245, 48, 186, 40, 6] - network_key: '!secret.yaml network_key' + network_key: "!secret.yaml network_key" log_level: info ingress: diff --git a/clusters/base/apps/zigbee2mqtt/secret.enc.yaml b/clusters/base/apps/zigbee2mqtt/secret.enc.yaml index f256a15..8e3c52f 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:mG1BWTCG8A3lHxpSTwrchYG/+UmAD0Qf8x49uXMCff7n66rs4C422RuOFl9RV3KJ/7ClV1H3FWnxkQHFHjCJ3pShUD4lk3I9PvqS9ezu5RapPA8DidvqK7dWUN4ZLU77m5K/55KIraaGeBZIwBo/0muG11IAqDdGMAQyb+0=,iv:iHWjWBGciWDZJ+Mgyvya4IMmRj8aZQUs1FA4HPySbGs=,tag:mkF1avcXdUFu114NtbS9EQ==,type:str] + secret.yaml: ENC[AES256_GCM,data:Bm/axxWEiSHuggnOlKAaUiJcWGx+z8Y3JeAThl71DuhGVC/0kHBb7DkihL1fW7ms8MuSFFpTjDGfl1Sf1T4k90mx9PQ9O7+QdiHaXHTgmX2DnKXHa7RCqmgzdvZCHLo0krdgkROA7146VEaDUhAf+mSm+d7Y9SfYJbfC97Y=,iv:5DNFF/jpnqXMnWohYloTvSbA1YHmRPartrbL4jruFz8=,tag:ZeTQC5fogAEUKYQ8GmwGHw==,type:str] sops: age: - recipient: age1tu4xgfefvgdda0vn2thaqndq4p9tuydq2ud6qa98tzzgnff6749qnlcx29 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIc0VKMFBtVmpZVTV3Q3Vz - ZmdWQ2ZqdFliRDFBNTl3NDRaZi9oVDY2REVvCitEVTVOUC8rNWhuWHJkNzJlM3FL - dWY5N3lYZEJXM2ZGU2pKNDA0SHNrOEEKLS0tICt2Q2lXcVRkMzhEVUpSZGgzaHhi - S2p6MndjQXY1Q3FycFNqSnJkcWxSZ1EKV9PyX/Z/PNA1S4rIIfLHXO4LSLHQOeZe - olFraDKhq+l/NlDBejpx/PfAwoPhTbGlltqGZx9p1URZQrCzh/9U7w== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyT0dCZDNqSGdpM3lESVFa + S0xlVHhNOEIvZ3ZPVUpmYXFBQjJUaWdDZlM4CjVQQ3N4NFFoY0wzYTY5dm5qcHI3 + VThMRzIyRU5sRnphTzA1TFRSRUkwdXMKLS0tIGZYbCtIK0xPRm10aGJjK0hTeEtI + dVdVMlJrT3dCa2JrR0dIbE5NbU9JTG8KrqovZIUOknPLUmQhPn8U2XIwj5Z9Nzs4 + GV2KigIHlIKBIg6PJmE4bEHXzOudd7H6h3mHBJzdgpuv2lg3MgyUhw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-08-26T10:18:14Z" - mac: ENC[AES256_GCM,data:1+kjTAr57fAXQmy0J+mSrn2/OuslTZQyXx0Jt/6fJNWlhPp2QeV814qw1gphqrvYfMmgwZvfe/vE/LvElNR6TypiUzpJ+NXPbEDd1NdZknWDPFhwfYrlB9qdholirFsT0DalHBbNlPceblMwTvbo3+rE4x8gfLFJTuJaXcC5fWI=,iv:/DtvjU1BDpTORYbmAqV591ISzK8sPhf75rAqZFkv8+Q=,tag:gGqfRxi6YlZoOz6zR7TXKg==,type:str] + lastmodified: "2026-08-26T10:18:18Z" + mac: ENC[AES256_GCM,data:n42Kyoe0ydzqnCM928Kj6cw4a09N8BVhd/HhK3x8I6yEcUuZw8xpESQvVCZRMZBJgXlPwUgyc/+erAmZevwNDInEXphu3T7Ori/sGrV/WJEqczXXQ3llr+gZ6of4SYU+uWRDOJ9TDu3Y1Srivr2+osz8awQwUyhM+u6Eu3X4Iog=,iv:ryYdXqWwwK93ZMvvVYwWVgSt6e8DaMBcgmgFmOFZpnE=,tag:krP7teRZo7Js//+h6nIdLQ==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.11.0 diff --git a/clusters/base/infra/storage-class-local-path-patch/kustomization.yaml b/clusters/base/infra/storage-class-local-path-patch/kustomization.yaml deleted file mode 100644 index f6fcb35..0000000 --- a/clusters/base/infra/storage-class-local-path-patch/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: [] -patches: - - patch: | - apiVersion: storage.k8s.io/v1 - kind: StorageClass - metadata: - name: local-path - annotations: - storageclass.kubernetes.io/is-default-class: "false" - target: - kind: StorageClass - name: local-path \ No newline at end of file diff --git a/clusters/base/infra/storage-class-longhorn-retain/kustomization.yaml b/clusters/base/infra/storage-class-longhorn-no-retain/kustomization.yaml similarity index 100% rename from clusters/base/infra/storage-class-longhorn-retain/kustomization.yaml rename to clusters/base/infra/storage-class-longhorn-no-retain/kustomization.yaml diff --git a/clusters/base/infra/storage-class-longhorn-retain/storageclass.yaml b/clusters/base/infra/storage-class-longhorn-no-retain/storageclass.yaml similarity index 65% rename from clusters/base/infra/storage-class-longhorn-retain/storageclass.yaml rename to clusters/base/infra/storage-class-longhorn-no-retain/storageclass.yaml index 3266666..6b265d0 100644 --- a/clusters/base/infra/storage-class-longhorn-retain/storageclass.yaml +++ b/clusters/base/infra/storage-class-longhorn-no-retain/storageclass.yaml @@ -1,11 +1,11 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: longhorn-retain + name: longhorn-no-retain annotations: - storageclass.kubernetes.io/is-default-class: "true" + storageclass.kubernetes.io/is-default-class: "false" provisioner: driver.longhorn.io -reclaimPolicy: Retain +reclaimPolicy: Delete allowVolumeExpansion: true parameters: numberOfReplicas: "3" diff --git a/clusters/home/infra/kustomization.yaml b/clusters/home/infra/kustomization.yaml index 3be039d..89ed771 100644 --- a/clusters/home/infra/kustomization.yaml +++ b/clusters/home/infra/kustomization.yaml @@ -1,5 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - storage-class-local-path-patch.yaml - - storage-class-longhorn-retain.yaml + - storage-class-longhorn-no-retain.yaml diff --git a/clusters/home/infra/storage-class-local-path-patch.yaml b/clusters/home/infra/storage-class-local-path-patch.yaml deleted file mode 100644 index e8181d9..0000000 --- a/clusters/home/infra/storage-class-local-path-patch.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: local-path-defaultclass-patch - namespace: flux-system -spec: - interval: 10m - sourceRef: - kind: GitRepository - name: flux-system - path: ./clusters/base/infra/storage-class-local-path-patch - prune: false # its a local-storage-provisioner object, dont let flux destroy it - wait: true \ No newline at end of file diff --git a/clusters/home/infra/storage-class-longhorn-retain.yaml b/clusters/home/infra/storage-class-longhorn-no-retain.yaml similarity index 78% rename from clusters/home/infra/storage-class-longhorn-retain.yaml rename to clusters/home/infra/storage-class-longhorn-no-retain.yaml index f422449..1a0a9b4 100644 --- a/clusters/home/infra/storage-class-longhorn-retain.yaml +++ b/clusters/home/infra/storage-class-longhorn-no-retain.yaml @@ -8,6 +8,6 @@ spec: sourceRef: kind: GitRepository name: flux-system - path: ./clusters/base/infra/storage-class-longhorn-retain + path: ./clusters/base/infra/storage-class-longhorn-no-retain prune: true wait: true