From 73831564688a3261e3a6975c17082d6446575e9c Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Wed, 17 Dec 2025 13:28:58 -0600 Subject: [PATCH] move volsync to chart --- clusters/cl01tl/helm/stalwart/Chart.lock | 7 ++- clusters/cl01tl/helm/stalwart/Chart.yaml | 4 ++ .../stalwart/templates/external-secret.yaml | 59 ------------------- .../templates/replication-source.yaml | 25 -------- clusters/cl01tl/helm/stalwart/values.yaml | 2 + 5 files changed, 11 insertions(+), 86 deletions(-) delete mode 100644 clusters/cl01tl/helm/stalwart/templates/replication-source.yaml diff --git a/clusters/cl01tl/helm/stalwart/Chart.lock b/clusters/cl01tl/helm/stalwart/Chart.lock index 9d9e11c9a..8a7c3ae30 100644 --- a/clusters/cl01tl/helm/stalwart/Chart.lock +++ b/clusters/cl01tl/helm/stalwart/Chart.lock @@ -8,5 +8,8 @@ dependencies: - name: redis-replication repository: oci://harbor.alexlebens.net/helm-charts version: 0.5.0 -digest: sha256:6ac63589feabc60e58add6e1619010c04627751fe767bf0cf451730630ee169c -generated: "2025-12-17T16:13:14.641288607Z" +- name: volsync-target + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +digest: sha256:964cd155f92589ca15099478733e0077f39e1e4c4c86a02726a3361dcabf0060 +generated: "2025-12-17T13:20:36.24325-06:00" diff --git a/clusters/cl01tl/helm/stalwart/Chart.yaml b/clusters/cl01tl/helm/stalwart/Chart.yaml index a5ca05cdd..c50fc08ca 100644 --- a/clusters/cl01tl/helm/stalwart/Chart.yaml +++ b/clusters/cl01tl/helm/stalwart/Chart.yaml @@ -28,5 +28,9 @@ dependencies: - name: redis-replication version: 0.5.0 repository: oci://harbor.alexlebens.net/helm-charts + - name: volsync-target + alias: volsync-target-config + version: 0.5.0 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/stalwart.png appVersion: v0.14.1 diff --git a/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml b/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml index ebaaa6199..80af11cdd 100644 --- a/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml @@ -34,65 +34,6 @@ spec: metadataPolicy: None property: roles ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: stalwart-config-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: stalwart-config-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: backup - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - target: - template: - mergePolicy: Merge - engineVersion: v2 - data: - RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/stalwart/stalwart-config" - data: - - secretKey: BUCKET_ENDPOINT - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/volsync/restic/config - metadataPolicy: None - property: S3_BUCKET_ENDPOINT - - secretKey: RESTIC_PASSWORD - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/volsync/restic/config - metadataPolicy: None - property: RESTIC_PASSWORD - - secretKey: AWS_DEFAULT_REGION - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/volsync/restic/config - metadataPolicy: None - property: AWS_DEFAULT_REGION - - secretKey: AWS_ACCESS_KEY_ID - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/volsync-backups - metadataPolicy: None - property: access_key - - secretKey: AWS_SECRET_ACCESS_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/volsync-backups - metadataPolicy: None - property: secret_key - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/clusters/cl01tl/helm/stalwart/templates/replication-source.yaml b/clusters/cl01tl/helm/stalwart/templates/replication-source.yaml deleted file mode 100644 index c838ec05a..000000000 --- a/clusters/cl01tl/helm/stalwart/templates/replication-source.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: volsync.backube/v1alpha1 -kind: ReplicationSource -metadata: - name: stalwart-config-backup-source - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: stalwart-config-backup-source - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - sourcePVC: stalwart-config - trigger: - schedule: 0 4 * * * - restic: - pruneIntervalDays: 7 - repository: stalwart-config-backup-secret - retain: - hourly: 1 - daily: 3 - weekly: 2 - monthly: 2 - yearly: 4 - copyMethod: Snapshot - storageClassName: ceph-block - volumeSnapshotClassName: ceph-blockpool-snapshot diff --git a/clusters/cl01tl/helm/stalwart/values.yaml b/clusters/cl01tl/helm/stalwart/values.yaml index cd6afdfb0..84783bb07 100644 --- a/clusters/cl01tl/helm/stalwart/values.yaml +++ b/clusters/cl01tl/helm/stalwart/values.yaml @@ -113,3 +113,5 @@ redis-replication: redisSentinel: enabled: true clusterSize: 3 +volsync-target-config: + pvcTarget: stalwart-config