diff --git a/clusters/cl01tl/manifests/talos/CronJob-talos-external.yaml b/clusters/cl01tl/manifests/talos/CronJob-talos-external.yaml index eb754823d..29017322f 100644 --- a/clusters/cl01tl/manifests/talos/CronJob-talos-external.yaml +++ b/clusters/cl01tl/manifests/talos/CronJob-talos-external.yaml @@ -57,11 +57,17 @@ spec: key: AWS_SECRET_ACCESS_KEY name: talos-etcd-backup-external-config - name: AWS_REGION - value: nyc3 + valueFrom: + secretKeyRef: + key: AWS_REGION + name: talos-etcd-backup-external-config - name: CUSTOM_S3_ENDPOINT value: https://nyc3.digitaloceanspaces.com - name: BUCKET - value: talos-backups-bee8585f7b8a4d0239c9b823 + valueFrom: + secretKeyRef: + key: BUCKET_NAME + name: talos-etcd-backup-external-config - name: S3_PREFIX value: cl01tl/etcd - name: CLUSTER_NAME diff --git a/clusters/cl01tl/manifests/talos/CronJob-talos-local.yaml b/clusters/cl01tl/manifests/talos/CronJob-talos-local.yaml index 89c32c77e..d5eb9f391 100644 --- a/clusters/cl01tl/manifests/talos/CronJob-talos-local.yaml +++ b/clusters/cl01tl/manifests/talos/CronJob-talos-local.yaml @@ -57,11 +57,17 @@ spec: key: AWS_SECRET_ACCESS_KEY name: talos-etcd-backup-local-config - name: AWS_REGION - value: us-east-1 + valueFrom: + secretKeyRef: + key: AWS_REGION + name: talos-etcd-backup-local-config - name: CUSTOM_S3_ENDPOINT value: http://garage-main.garage:3900 - name: BUCKET - value: talos-backups + valueFrom: + secretKeyRef: + key: BUCKET_NAME + name: talos-etcd-backup-local-config - name: S3_PREFIX value: cl01tl/etcd - name: CLUSTER_NAME diff --git a/clusters/cl01tl/manifests/talos/CronJob-talos-remote.yaml b/clusters/cl01tl/manifests/talos/CronJob-talos-remote.yaml index c335559cb..f38a0e721 100644 --- a/clusters/cl01tl/manifests/talos/CronJob-talos-remote.yaml +++ b/clusters/cl01tl/manifests/talos/CronJob-talos-remote.yaml @@ -57,11 +57,17 @@ spec: key: AWS_SECRET_ACCESS_KEY name: talos-etcd-backup-remote-config - name: AWS_REGION - value: us-east-1 + valueFrom: + secretKeyRef: + key: AWS_REGION + name: talos-etcd-backup-remote-config - name: CUSTOM_S3_ENDPOINT value: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - name: BUCKET - value: talos-backups + valueFrom: + secretKeyRef: + key: BUCKET_NAME + name: talos-etcd-backup-remote-config - name: S3_PREFIX value: cl01tl/etcd - name: CLUSTER_NAME diff --git a/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-external-config.yaml b/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-external-config.yaml index a2dd66018..ab64acb88 100644 --- a/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-external-config.yaml +++ b/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-external-config.yaml @@ -20,6 +20,14 @@ spec: remoteRef: key: /digital-ocean/home-infra/talos-backups property: AWS_SECRET_ACCESS_KEY + - secretKey: AWS_REGION + remoteRef: + key: /digital-ocean/home-infra/talos-backups + property: AWS_REGION + - secretKey: BUCKET_NAME + remoteRef: + key: /digital-ocean/home-infra/talos-backups + property: BUCKET - secretKey: BUCKET remoteRef: key: /digital-ocean/home-infra/talos-backups diff --git a/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-local-config.yaml b/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-local-config.yaml index 1dce794d2..7ac01045a 100644 --- a/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-local-config.yaml +++ b/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-local-config.yaml @@ -20,6 +20,14 @@ spec: remoteRef: key: /garage/home-infra/talos-backups property: ACCESS_SECRET_KEY + - secretKey: AWS_REGION + remoteRef: + key: /garage/home-infra/talos-backups + property: ACCESS_REGION + - secretKey: BUCKET_NAME + remoteRef: + key: /garage/home-infra/talos-backups + property: BUCKET - secretKey: BUCKET remoteRef: key: /garage/home-infra/talos-backups diff --git a/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-remote-config.yaml b/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-remote-config.yaml index ec3150b20..e06845e9f 100644 --- a/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-remote-config.yaml +++ b/clusters/cl01tl/manifests/talos/ExternalSecret-talos-etcd-backup-remote-config.yaml @@ -20,6 +20,14 @@ spec: remoteRef: key: /garage/home-infra/talos-backups property: ACCESS_SECRET_KEY + - secretKey: AWS_REGION + remoteRef: + key: /garage/home-infra/talos-backups + property: ACCESS_REGION + - secretKey: BUCKET_NAME + remoteRef: + key: /garage/home-infra/talos-backups + property: BUCKET - secretKey: BUCKET remoteRef: key: /garage/home-infra/talos-backups