From 5454d9c35a986a6aa3048cac4f7344eebe89e0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Thu, 24 Apr 2025 20:45:37 +0000 Subject: [PATCH] modified: README.md modified: backups/backup-cronjob.yaml renamed: backups/gitea-backup-secret.yaml -> backups/gitea-backup-secrets.yaml --- README.md | 27 +++++++++++-------- backups/backup-cronjob.yaml | 3 +++ ...-secret.yaml => gitea-backup-secrets.yaml} | 0 3 files changed, 19 insertions(+), 11 deletions(-) rename backups/{gitea-backup-secret.yaml => gitea-backup-secrets.yaml} (100%) diff --git a/README.md b/README.md index 7fc1c00..fef5a9a 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ Using [gitea](https://git.limbosolutions.com/kb/gitea) as git server. - [Install / Update](#install--update) - [ssh ingress](#ssh-ingress) - [Backups](#backups) + - [secrets](#secrets) - [Proxmox Backup Server (kubernetes cron job)](#proxmox-backup-server-kubernetes-cron-job) - [Borg and Offsite sync (kubernetes cron job)](#borg-and-offsite-sync-kubernetes-cron-job) - [borgbackup sidekick](#borgbackup-sidekick) @@ -60,6 +61,21 @@ kubectl apply -f ./gitea/ssh-ingress.yaml ## Backups +### secrets + +``` bash +set -a +source ./backups/.env +set +a +envsubst < ./backups/gitea-backup-secrets.yaml | kubectl apply -n git-limbosolutions-com -f - + +SSH_ID_RSA=$(echo -n "$SSH_ID_RSA" | base64 -w 0) +BORG_KEY_FILE=$(echo -n "$BORG_KEY_FILE" | base64 -w 0) + +kubectl patch secret gitea-backup-secret --patch "{\"data\":{\"SSH_ID_RSA\":\"$SSH_ID_RSA\"}}" +kubectl patch secret gitea-backup-secret --patch "{\"data\":{\"BORG_KEY_FILE\":\"$BORG_KEY_FILE\"}}" +``` + ### Proxmox Backup Server (kubernetes cron job) ```bash @@ -72,17 +88,6 @@ kubectl apply -f ./backups/backup-cronjob.yaml -n git-limbosolutions-com ### Borg and Offsite sync (kubernetes cron job) ```bash -set -a -source ./backups/.env -set +a -envsubst < ./backups/gitea-backup-secret.yaml | kubectl apply -n git-limbosolutions-com -f - - -SSH_ID_RSA=$(echo -n "$SSH_ID_RSA" | base64 -w 0) -BORG_KEY_FILE=$(echo -n "$BORG_KEY_FILE" | base64 -w 0) - -kubectl patch secret gitea-backup-secret --patch "{\"data\":{\"SSH_ID_RSA\":\"$SSH_ID_RSA\"}}" -kubectl patch secret gitea-backup-secret --patch "{\"data\":{\"BORG_KEY_FILE\":\"$BORG_KEY_FILE\"}}" - # deploy cronjon kubectl apply -f ./backups/borgbackup-offsite-cronjob.yaml ``` diff --git a/backups/backup-cronjob.yaml b/backups/backup-cronjob.yaml index b01d6a5..896cec1 100644 --- a/backups/backup-cronjob.yaml +++ b/backups/backup-cronjob.yaml @@ -64,6 +64,9 @@ spec: args: - | set -e + # while true; do + # sleep 1s + # done SCRIPT_START_TIME=$(date +%s) proxmox-backup-client backup gitea-data.pxar:/data/gitea-data postgresql-data.pxar:/data/postgresql-data postgresql-export.pxar:/data/postgresql-export --include-dev /data/postgresql-data --include-dev /data/postgresql-export --include-dev /data/gitea-data --backup-id "gitea-full" -ns git.limbosolutions.com SCRIPT_DURATION=$(($(date +%s) - SCRIPT_START_TIME)) diff --git a/backups/gitea-backup-secret.yaml b/backups/gitea-backup-secrets.yaml similarity index 100% rename from backups/gitea-backup-secret.yaml rename to backups/gitea-backup-secrets.yaml