From 045f998bca55875e688a73652e9b63699403725e Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Tue, 16 Dec 2025 03:44:25 +0000 Subject: [PATCH] chore: Update manifests after change --- ...cret-ephemera-backup-secret-external.yaml} | 21 ++++--- ...alSecret-ephemera-backup-secret-local.yaml | 58 +++++++++++++++++++ ...lSecret-ephemera-backup-secret-remote.yaml | 58 +++++++++++++++++++ ...urce-ephemera-backup-source-external.yaml} | 15 +++-- ...onSource-ephemera-backup-source-local.yaml | 29 ++++++++++ ...nSource-ephemera-backup-source-remote.yaml | 29 ++++++++++ 6 files changed, 195 insertions(+), 15 deletions(-) rename clusters/cl01tl/manifests/ephemera/{ExternalSecret-ephemera-config-backup-secret.yaml => ExternalSecret-ephemera-backup-secret-external.yaml} (73%) create mode 100644 clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-local.yaml create mode 100644 clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-remote.yaml rename clusters/cl01tl/manifests/ephemera/{ReplicationSource-ephemera-config-backup-source.yaml => ReplicationSource-ephemera-backup-source-external.yaml} (63%) create mode 100644 clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-local.yaml create mode 100644 clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-remote.yaml diff --git a/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-config-backup-secret.yaml b/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-external.yaml similarity index 73% rename from clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-config-backup-secret.yaml rename to clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-external.yaml index 368517105..e9d2b3200 100644 --- a/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-config-backup-secret.yaml +++ b/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-external.yaml @@ -1,12 +1,15 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: ephemera-config-backup-secret + name: ephemera-backup-secret-external namespace: ephemera labels: - app.kubernetes.io/name: ephemera-config-backup-secret + helm.sh/chart: volsync-target-config-0.3.0 app.kubernetes.io/instance: ephemera app.kubernetes.io/part-of: ephemera + app.kubernetes.io/version: "0.3.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera-backup-secret-external spec: secretStoreRef: kind: ClusterSecretStore @@ -16,27 +19,27 @@ spec: mergePolicy: Merge engineVersion: v2 data: - RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ephemera/ephemera-config" + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ephemera/ephemera" 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/ephemera/ExternalSecret-ephemera-backup-secret-local.yaml b/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-local.yaml new file mode 100644 index 000000000..74c4ceb91 --- /dev/null +++ b/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-local.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: ephemera-backup-secret-local + namespace: ephemera + labels: + helm.sh/chart: volsync-target-config-0.3.0 + app.kubernetes.io/instance: ephemera + app.kubernetes.io/part-of: ephemera + app.kubernetes.io/version: "0.3.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera-backup-secret-local +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ephemera/ephemera" + 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/ephemera/ExternalSecret-ephemera-backup-secret-remote.yaml b/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-remote.yaml new file mode 100644 index 000000000..a44ff429f --- /dev/null +++ b/clusters/cl01tl/manifests/ephemera/ExternalSecret-ephemera-backup-secret-remote.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: ephemera-backup-secret-remote + namespace: ephemera + labels: + helm.sh/chart: volsync-target-config-0.3.0 + app.kubernetes.io/instance: ephemera + app.kubernetes.io/part-of: ephemera + app.kubernetes.io/version: "0.3.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera-backup-secret-remote +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/ephemera/ephemera" + 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/ephemera/ReplicationSource-ephemera-config-backup-source.yaml b/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-external.yaml similarity index 63% rename from clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-config-backup-source.yaml rename to clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-external.yaml index 33d81d8ca..740903024 100644 --- a/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-config-backup-source.yaml +++ b/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-external.yaml @@ -1,26 +1,29 @@ apiVersion: volsync.backube/v1alpha1 kind: ReplicationSource metadata: - name: ephemera-config-backup-source + name: ephemera-backup-source-external namespace: ephemera labels: - app.kubernetes.io/name: ephemera-config-backup-source + helm.sh/chart: volsync-target-config-0.3.0 app.kubernetes.io/instance: ephemera app.kubernetes.io/part-of: ephemera + app.kubernetes.io/version: "0.3.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera-backup spec: sourcePVC: ephemera trigger: schedule: 0 4 * * * restic: pruneIntervalDays: 7 - repository: ephemera-config-backup-secret + repository: ephemera-backup-secret-external retain: - hourly: 1 daily: 3 - weekly: 2 + hourly: 1 monthly: 2 + weekly: 2 yearly: 4 copyMethod: Snapshot storageClassName: ceph-block volumeSnapshotClassName: ceph-blockpool-snapshot - cacheCapacity: 10Gi + cacheCapacity: 1Gi diff --git a/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-local.yaml b/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-local.yaml new file mode 100644 index 000000000..5ff880ae0 --- /dev/null +++ b/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-local.yaml @@ -0,0 +1,29 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: ephemera-backup-source-local + namespace: ephemera + labels: + helm.sh/chart: volsync-target-config-0.3.0 + app.kubernetes.io/instance: ephemera + app.kubernetes.io/part-of: ephemera + app.kubernetes.io/version: "0.3.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera-backup +spec: + sourcePVC: ephemera + trigger: + schedule: 0 2 * * * + restic: + pruneIntervalDays: 7 + repository: ephemera-backup-secret-local + retain: + daily: 3 + hourly: 1 + monthly: 2 + weekly: 2 + yearly: 4 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi diff --git a/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-remote.yaml b/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-remote.yaml new file mode 100644 index 000000000..870e41f52 --- /dev/null +++ b/clusters/cl01tl/manifests/ephemera/ReplicationSource-ephemera-backup-source-remote.yaml @@ -0,0 +1,29 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: ephemera-backup-source-remote + namespace: ephemera + labels: + helm.sh/chart: volsync-target-config-0.3.0 + app.kubernetes.io/instance: ephemera + app.kubernetes.io/part-of: ephemera + app.kubernetes.io/version: "0.3.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera-backup +spec: + sourcePVC: ephemera + trigger: + schedule: 0 3 * * * + restic: + pruneIntervalDays: 7 + repository: ephemera-backup-secret-remote + retain: + daily: 3 + hourly: 1 + monthly: 2 + weekly: 2 + yearly: 4 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi