From 6f43520c9422001832822432af895fc7811cf741 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Wed, 17 Dec 2025 11:29:03 -0600 Subject: [PATCH] move volsync to chart --- clusters/cl01tl/helm/ollama/Chart.lock | 7 ++- clusters/cl01tl/helm/ollama/Chart.yaml | 4 ++ .../ollama/templates/external-secret.yaml | 57 ------------------- .../ollama/templates/replication-source.yaml | 28 --------- clusters/cl01tl/helm/ollama/values.yaml | 6 ++ 5 files changed, 15 insertions(+), 87 deletions(-) delete mode 100644 clusters/cl01tl/helm/ollama/templates/replication-source.yaml diff --git a/clusters/cl01tl/helm/ollama/Chart.lock b/clusters/cl01tl/helm/ollama/Chart.lock index 98e9fee23..b29116d93 100644 --- a/clusters/cl01tl/helm/ollama/Chart.lock +++ b/clusters/cl01tl/helm/ollama/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 7.1.3 -digest: sha256:639e6a2931f61cba27b306b6949bf5dd1fffb04682b4179f29b2561dc1f22b48 -generated: "2025-12-17T16:11:11.863081712Z" +- name: volsync-target + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +digest: sha256:d3b6a59e3f33b0f9b75ab5de98a027df2cff8d8a8fd5eb921d86eb2b62f6b072 +generated: "2025-12-17T11:28:44.339984-06:00" diff --git a/clusters/cl01tl/helm/ollama/Chart.yaml b/clusters/cl01tl/helm/ollama/Chart.yaml index 7583df05e..43266c672 100644 --- a/clusters/cl01tl/helm/ollama/Chart.yaml +++ b/clusters/cl01tl/helm/ollama/Chart.yaml @@ -25,5 +25,9 @@ dependencies: alias: postgres-18-cluster version: 7.1.3 repository: oci://harbor.alexlebens.net/helm-charts + - name: volsync-target + alias: volsync-target-data + version: 0.5.0 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/ollama.png appVersion: 0.13.3 diff --git a/clusters/cl01tl/helm/ollama/templates/external-secret.yaml b/clusters/cl01tl/helm/ollama/templates/external-secret.yaml index af6d8c067..bc245677b 100644 --- a/clusters/cl01tl/helm/ollama/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/ollama/templates/external-secret.yaml @@ -51,63 +51,6 @@ spec: metadataPolicy: None property: secret ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: ollama-web-data-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: ollama-web-data-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - target: - template: - mergePolicy: Merge - engineVersion: v2 - data: - RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/ollama/ollama-web" - 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/ollama/templates/replication-source.yaml b/clusters/cl01tl/helm/ollama/templates/replication-source.yaml deleted file mode 100644 index 8add7efa0..000000000 --- a/clusters/cl01tl/helm/ollama/templates/replication-source.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: volsync.backube/v1alpha1 -kind: ReplicationSource -metadata: - name: ollama-web-data-backup-source - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: ollama-web-data-backup-source - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - sourcePVC: ollama-web-data - trigger: - schedule: 0 4 * * * - restic: - pruneIntervalDays: 7 - repository: ollama-web-data-backup-secret - retain: - hourly: 1 - daily: 3 - weekly: 2 - monthly: 2 - yearly: 4 - moverSecurityContext: - runAsUser: 1337 - runAsGroup: 1337 - copyMethod: Snapshot - storageClassName: ceph-block - volumeSnapshotClassName: ceph-blockpool-snapshot diff --git a/clusters/cl01tl/helm/ollama/values.yaml b/clusters/cl01tl/helm/ollama/values.yaml index d97eefc41..b6704106d 100644 --- a/clusters/cl01tl/helm/ollama/values.yaml +++ b/clusters/cl01tl/helm/ollama/values.yaml @@ -227,6 +227,7 @@ ollama: - path: /root/.ollama readOnly: false web-data: + forceRename: ollama-web-data storageClass: ceph-block accessMode: ReadWriteOnce size: 5Gi @@ -292,3 +293,8 @@ postgres-18-cluster: # immediate: true # schedule: "0 0 4 * * SAT" # backupName: garage-remote +volsync-target-data: + pvcTarget: ollama-web-data + moverSecurityContext: + runAsUser: 1337 + runAsGroup: 1337