From 5b0d1bcdf0e20c8f5f10be693aad1f6f7be2a4da Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Wed, 17 Dec 2025 17:29:25 +0000 Subject: [PATCH] chore: Update manifests after change --- ...lama-web-data-backup-secret-external.yaml} | 21 ++++--- ...t-ollama-web-data-backup-secret-local.yaml | 58 +++++++++++++++++++ ...-ollama-web-data-backup-secret-remote.yaml | 58 +++++++++++++++++++ ...lama-web-data-backup-source-external.yaml} | 16 +++-- ...e-ollama-web-data-backup-source-local.yaml | 32 ++++++++++ ...-ollama-web-data-backup-source-remote.yaml | 32 ++++++++++ 6 files changed, 202 insertions(+), 15 deletions(-) rename clusters/cl01tl/manifests/ollama/{ExternalSecret-ollama-web-data-backup-secret.yaml => ExternalSecret-ollama-web-data-backup-secret-external.yaml} (72%) create mode 100644 clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-local.yaml create mode 100644 clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-remote.yaml rename clusters/cl01tl/manifests/ollama/{ReplicationSource-ollama-web-data-backup-source.yaml => ReplicationSource-ollama-web-data-backup-source-external.yaml} (65%) create mode 100644 clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-local.yaml create mode 100644 clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-remote.yaml diff --git a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret.yaml b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-external.yaml similarity index 72% rename from clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret.yaml rename to clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-external.yaml index 1e16f307a..474a67417 100644 --- a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret.yaml +++ b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-external.yaml @@ -1,12 +1,15 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: ollama-web-data-backup-secret + name: ollama-web-data-backup-secret-external namespace: ollama labels: - app.kubernetes.io/name: ollama-web-data-backup-secret + helm.sh/chart: volsync-target-data-0.5.0 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ollama-web-data-backup-secret-external spec: secretStoreRef: kind: ClusterSecretStore @@ -16,27 +19,27 @@ spec: mergePolicy: Merge engineVersion: v2 data: - RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ollama/ollama-web" + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ollama/ollama-web-data" data: - secretKey: BUCKET_ENDPOINT remoteRef: conversionStrategy: Default decodingStrategy: None - key: /cl01tl/volsync/restic/config + key: /volsync/restic/digital-ocean metadataPolicy: None - property: S3_BUCKET_ENDPOINT + property: BUCKET_ENDPOINT - secretKey: RESTIC_PASSWORD remoteRef: conversionStrategy: Default decodingStrategy: None - key: /cl01tl/volsync/restic/config + key: /volsync/restic/digital-ocean metadataPolicy: None property: RESTIC_PASSWORD - secretKey: AWS_DEFAULT_REGION remoteRef: conversionStrategy: Default decodingStrategy: None - key: /cl01tl/volsync/restic/config + key: /digital-ocean/home-infra/volsync-backups metadataPolicy: None property: AWS_DEFAULT_REGION - secretKey: AWS_ACCESS_KEY_ID @@ -45,11 +48,11 @@ spec: decodingStrategy: None key: /digital-ocean/home-infra/volsync-backups metadataPolicy: None - property: access_key + property: AWS_ACCESS_KEY_ID - secretKey: AWS_SECRET_ACCESS_KEY remoteRef: conversionStrategy: Default decodingStrategy: None key: /digital-ocean/home-infra/volsync-backups metadataPolicy: None - property: secret_key + property: AWS_SECRET_ACCESS_KEY diff --git a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-local.yaml b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-local.yaml new file mode 100644 index 000000000..a4a28afca --- /dev/null +++ b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-local.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: ollama-web-data-backup-secret-local + namespace: ollama + labels: + helm.sh/chart: volsync-target-data-0.5.0 + app.kubernetes.io/instance: ollama + app.kubernetes.io/part-of: ollama + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ollama-web-data-backup-secret-local +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ollama/ollama-web-data" + data: + - secretKey: BUCKET_ENDPOINT + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-local + metadataPolicy: None + property: BUCKET_ENDPOINT + - secretKey: RESTIC_PASSWORD + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-local + metadataPolicy: None + property: RESTIC_PASSWORD + - secretKey: AWS_DEFAULT_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_REGION + - secretKey: AWS_ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_KEY_ID + - secretKey: AWS_SECRET_ACCESS_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_SECRET_KEY diff --git a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-remote.yaml b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-remote.yaml new file mode 100644 index 000000000..6d3652b42 --- /dev/null +++ b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-data-backup-secret-remote.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: ollama-web-data-backup-secret-remote + namespace: ollama + labels: + helm.sh/chart: volsync-target-data-0.5.0 + app.kubernetes.io/instance: ollama + app.kubernetes.io/part-of: ollama + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ollama-web-data-backup-secret-remote +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ollama/ollama-web-data" + data: + - secretKey: BUCKET_ENDPOINT + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-remote + metadataPolicy: None + property: BUCKET_ENDPOINT + - secretKey: RESTIC_PASSWORD + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-remote + metadataPolicy: None + property: RESTIC_PASSWORD + - secretKey: AWS_DEFAULT_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_REGION + - secretKey: AWS_ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_KEY_ID + - secretKey: AWS_SECRET_ACCESS_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_SECRET_KEY diff --git a/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source.yaml b/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-external.yaml similarity index 65% rename from clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source.yaml rename to clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-external.yaml index e5dbdea45..8fc75a483 100644 --- a/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source.yaml +++ b/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-external.yaml @@ -1,28 +1,32 @@ apiVersion: volsync.backube/v1alpha1 kind: ReplicationSource metadata: - name: ollama-web-data-backup-source + name: ollama-web-data-backup-source-external namespace: ollama labels: - app.kubernetes.io/name: ollama-web-data-backup-source + helm.sh/chart: volsync-target-data-0.5.0 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ollama-web-data-backup spec: sourcePVC: ollama-web-data trigger: schedule: 0 4 * * * restic: pruneIntervalDays: 7 - repository: ollama-web-data-backup-secret + repository: ollama-web-data-backup-secret-external retain: - hourly: 1 daily: 3 - weekly: 2 + hourly: 1 monthly: 2 + weekly: 2 yearly: 4 moverSecurityContext: - runAsUser: 1337 runAsGroup: 1337 + runAsUser: 1337 copyMethod: Snapshot storageClassName: ceph-block volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi diff --git a/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-local.yaml b/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-local.yaml new file mode 100644 index 000000000..fb8f6af34 --- /dev/null +++ b/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-local.yaml @@ -0,0 +1,32 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: ollama-web-data-backup-source-local + namespace: ollama + labels: + helm.sh/chart: volsync-target-data-0.5.0 + app.kubernetes.io/instance: ollama + app.kubernetes.io/part-of: ollama + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ollama-web-data-backup +spec: + sourcePVC: ollama-web-data + trigger: + schedule: 0 2 * * * + restic: + pruneIntervalDays: 7 + repository: ollama-web-data-backup-secret-local + retain: + daily: 3 + hourly: 1 + monthly: 2 + weekly: 2 + yearly: 4 + moverSecurityContext: + runAsGroup: 1337 + runAsUser: 1337 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi diff --git a/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-remote.yaml b/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-remote.yaml new file mode 100644 index 000000000..f58ce8aef --- /dev/null +++ b/clusters/cl01tl/manifests/ollama/ReplicationSource-ollama-web-data-backup-source-remote.yaml @@ -0,0 +1,32 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: ollama-web-data-backup-source-remote + namespace: ollama + labels: + helm.sh/chart: volsync-target-data-0.5.0 + app.kubernetes.io/instance: ollama + app.kubernetes.io/part-of: ollama + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ollama-web-data-backup +spec: + sourcePVC: ollama-web-data + trigger: + schedule: 0 3 * * * + restic: + pruneIntervalDays: 7 + repository: ollama-web-data-backup-secret-remote + retain: + daily: 3 + hourly: 1 + monthly: 2 + weekly: 2 + yearly: 4 + moverSecurityContext: + runAsGroup: 1337 + runAsUser: 1337 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi