Compare commits
2 Commits
e6b934a428
...
17483d8ceb
Author | SHA1 | Date | |
---|---|---|---|
17483d8ceb | |||
7ed7fcccac |
@@ -21,14 +21,17 @@ dependencies:
|
|||||||
- name: gitea
|
- name: gitea
|
||||||
version: 11.0.0
|
version: 11.0.0
|
||||||
repository: https://dl.gitea.io/charts/
|
repository: https://dl.gitea.io/charts/
|
||||||
- name: cloudflared
|
|
||||||
alias: cloudflared
|
|
||||||
repository: http://alexlebens.github.io/helm-charts
|
|
||||||
version: 1.14.2
|
|
||||||
- name: app-template
|
- name: app-template
|
||||||
alias: backup
|
alias: backup
|
||||||
repository: https://bjw-s.github.io/helm-charts/
|
repository: https://bjw-s.github.io/helm-charts/
|
||||||
version: 3.7.2
|
version: 3.7.2
|
||||||
|
- name: valkey
|
||||||
|
version: 2.4.4
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
- name: cloudflared
|
||||||
|
alias: cloudflared
|
||||||
|
repository: http://alexlebens.github.io/helm-charts
|
||||||
|
version: 1.14.2
|
||||||
- name: postgres-cluster
|
- name: postgres-cluster
|
||||||
alias: postgres-17-cluster
|
alias: postgres-17-cluster
|
||||||
version: 4.2.1
|
version: 4.2.1
|
||||||
|
@@ -117,6 +117,13 @@ spec:
|
|||||||
key: /digital-ocean/home-infra/gitea-backup
|
key: /digital-ocean/home-infra/gitea-backup
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
property: AWS_SECRET_ACCESS_KEY
|
property: AWS_SECRET_ACCESS_KEY
|
||||||
|
- secretKey: S3_REPOSITORY
|
||||||
|
remoteRef:
|
||||||
|
conversionStrategy: Default
|
||||||
|
decodingStrategy: None
|
||||||
|
key: /digital-ocean/home-infra/gitea-backup
|
||||||
|
metadataPolicy: None
|
||||||
|
property: S3_REPOSITORY
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: external-secrets.io/v1beta1
|
apiVersion: external-secrets.io/v1beta1
|
||||||
|
@@ -59,6 +59,9 @@ gitea:
|
|||||||
SCHEMA: public
|
SCHEMA: public
|
||||||
oauth2_client:
|
oauth2_client:
|
||||||
ENABLE_AUTO_REGISTRATION: true
|
ENABLE_AUTO_REGISTRATION: true
|
||||||
|
cache:
|
||||||
|
ADAPTER: redis
|
||||||
|
HOST: redis://gitea-valkey-headless.gitea:6379
|
||||||
service:
|
service:
|
||||||
REGISTER_MANUAL_CONFIRM: true
|
REGISTER_MANUAL_CONFIRM: true
|
||||||
SHOW_REGISTRATION_BUTTON: false
|
SHOW_REGISTRATION_BUTTON: false
|
||||||
@@ -91,7 +94,7 @@ gitea:
|
|||||||
name: gitea-postgresql-17-cluster-app
|
name: gitea-postgresql-17-cluster-app
|
||||||
key: password
|
key: password
|
||||||
memcached:
|
memcached:
|
||||||
enabled: true
|
enabled: false
|
||||||
redis:
|
redis:
|
||||||
enabled: false
|
enabled: false
|
||||||
redis-cluster:
|
redis-cluster:
|
||||||
@@ -104,8 +107,6 @@ gitea:
|
|||||||
enabled: false
|
enabled: false
|
||||||
mariadb:
|
mariadb:
|
||||||
enabled: false
|
enabled: false
|
||||||
cloudflared:
|
|
||||||
existingSecretName: gitea-cloudflared-secret
|
|
||||||
backup:
|
backup:
|
||||||
global:
|
global:
|
||||||
fullnameOverride: gitea-backup
|
fullnameOverride: gitea-backup
|
||||||
@@ -150,8 +151,10 @@ backup:
|
|||||||
args:
|
args:
|
||||||
- -ec
|
- -ec
|
||||||
- |
|
- |
|
||||||
s3cmd put --no-check-md5 --no-check-certificate -v /opt/backup/gitea-backup.zip s3://gitea-backups-8ba8dae3674a2f53354c600e/cl01tl/cl01tl-gitea-backups/gitea-backup-$(date +"%Y%m%d-%H-%M").zip;
|
echo ">> Running S3 backup for Gitea"
|
||||||
|
s3cmd put --no-check-md5 --no-check-certificate -v /opt/backup/gitea-backup.zip ${S3_REPOSITORY}/gitea-backup-$(date +"%Y%m%d-%H-%M").zip;
|
||||||
mv /opt/backup/gitea-backup.zip /opt/backup/gitea-backup-$(date +"%Y%m%d-%H-%M").zip;
|
mv /opt/backup/gitea-backup.zip /opt/backup/gitea-backup-$(date +"%Y%m%d-%H-%M").zip;
|
||||||
|
echo ">> Completed S3 backup for Gitea"
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: gitea-backup-s3
|
name: gitea-backup-s3
|
||||||
@@ -170,12 +173,14 @@ backup:
|
|||||||
- -ec
|
- -ec
|
||||||
- |
|
- |
|
||||||
export WEEK_AGO=$(date -d @$(( $(date +%s) - 604800 )) +%Y-%m-%d\ %H:%M:%S);
|
export WEEK_AGO=$(date -d @$(( $(date +%s) - 604800 )) +%Y-%m-%d\ %H:%M:%S);
|
||||||
|
echo ">> Running S3 prune for Gitea backup repository"
|
||||||
s3cmd ls -v s3://gitea-backups-8ba8dae3674a2f53354c600e/cl01tl/cl01tl-gitea-backups/ |
|
echo ">> Backups prior to '$WEEK_AGO' will be removed"
|
||||||
|
s3cmd ls -v $S3_REPOSITORY |
|
||||||
awk -v week_ago="$WEEK_AGO" '$1 < week_ago {print $4}' |
|
awk -v week_ago="$WEEK_AGO" '$1 < week_ago {print $4}' |
|
||||||
while read file;
|
while read file;
|
||||||
do s3cmd del -v "$file";
|
do s3cmd del -v "$file";
|
||||||
done;
|
done;
|
||||||
|
echo ">> Completed S3 prune for Gitea backup repository"
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: gitea-backup-s3
|
name: gitea-backup-s3
|
||||||
@@ -209,6 +214,20 @@ backup:
|
|||||||
readOnly: true
|
readOnly: true
|
||||||
mountPropagation: None
|
mountPropagation: None
|
||||||
subPath: .s3cfg
|
subPath: .s3cfg
|
||||||
|
valkey:
|
||||||
|
architecture: standalone
|
||||||
|
auth:
|
||||||
|
enabled: false
|
||||||
|
usePasswordFiles: false
|
||||||
|
primary:
|
||||||
|
persistence:
|
||||||
|
enabled: true
|
||||||
|
size: 5Gi
|
||||||
|
replica:
|
||||||
|
persistence:
|
||||||
|
enabled: false
|
||||||
|
cloudflared:
|
||||||
|
existingSecretName: gitea-cloudflared-secret
|
||||||
postgres-17-cluster:
|
postgres-17-cluster:
|
||||||
mode: standalone
|
mode: standalone
|
||||||
cluster:
|
cluster:
|
||||||
|
@@ -178,10 +178,12 @@ snapshot:
|
|||||||
- -ec
|
- -ec
|
||||||
- |
|
- |
|
||||||
apk add --no-cache jq;
|
apk add --no-cache jq;
|
||||||
|
echo ">> Running Vault snapshot"
|
||||||
export VAULT_TOKEN=$(vault write auth/approle/login role_id=$VAULT_APPROLE_ROLE_ID secret_id=$VAULT_APPROLE_SECRET_ID -format=json | jq -r .auth.client_token);
|
export VAULT_TOKEN=$(vault write auth/approle/login role_id=$VAULT_APPROLE_ROLE_ID secret_id=$VAULT_APPROLE_SECRET_ID -format=json | jq -r .auth.client_token);
|
||||||
vault operator raft snapshot save /opt/backup/vault-snapshot-latest.snap;
|
vault operator raft snapshot save /opt/backup/vault-snapshot-latest.snap;
|
||||||
cp /opt/backup/vault-snapshot-latest.snap /opt/backup/vault-snapshot-$(date +"%Y%m%d-%H-%M").snap;
|
cp /opt/backup/vault-snapshot-latest.snap /opt/backup/vault-snapshot-$(date +"%Y%m%d-%H-%M").snap;
|
||||||
cp /opt/backup/vault-snapshot-latest.snap /opt/backup/vault-snapshot-s3.snap;
|
cp /opt/backup/vault-snapshot-latest.snap /opt/backup/vault-snapshot-s3.snap;
|
||||||
|
echo ">> Completed Vault snapshot"
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: vault-snapshot-agent-token
|
name: vault-snapshot-agent-token
|
||||||
@@ -203,8 +205,10 @@ snapshot:
|
|||||||
args:
|
args:
|
||||||
- -ec
|
- -ec
|
||||||
- |
|
- |
|
||||||
|
echo ">> Running S3 backup for Vault snapshot"
|
||||||
s3cmd put --no-check-md5 --no-check-certificate -v /opt/backup/vault-snapshot-s3.snap ${S3_REPOSITORY}/vault-snapshot-$(date +"%Y%m%d-%H-%M").snap;
|
s3cmd put --no-check-md5 --no-check-certificate -v /opt/backup/vault-snapshot-s3.snap ${S3_REPOSITORY}/vault-snapshot-$(date +"%Y%m%d-%H-%M").snap;
|
||||||
rm -f /opt/backup/vault-snapshot-s3.snap;
|
rm -f /opt/backup/vault-snapshot-s3.snap;
|
||||||
|
echo ">> Completed S3 backup for Vault snapshot"
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: vault-snapshot-s3
|
name: vault-snapshot-s3
|
||||||
@@ -223,12 +227,14 @@ snapshot:
|
|||||||
- -ec
|
- -ec
|
||||||
- |
|
- |
|
||||||
export MONTH_AGO=$(date -d @$(( $(date +%s) - 2592000 )) +%Y-%m-%d\ %H:%M:%S);
|
export MONTH_AGO=$(date -d @$(( $(date +%s) - 2592000 )) +%Y-%m-%d\ %H:%M:%S);
|
||||||
|
echo ">> Running S3 prune for Vault snapshot repository"
|
||||||
|
echo ">> Backups prior to '$MONTH_AGO' will be removed"
|
||||||
s3cmd ls -v $S3_REPOSITORY |
|
s3cmd ls -v $S3_REPOSITORY |
|
||||||
awk -v month_ago="$MONTH_AGO" '$1 < month_ago {print $4}' |
|
awk -v month_ago="$MONTH_AGO" '$1 < month_ago {print $4}' |
|
||||||
while read file;
|
while read file;
|
||||||
do s3cmd del -v "$file";
|
do s3cmd del -v "$file";
|
||||||
done;
|
done;
|
||||||
|
echo ">> Completed S3 prune for Vault snapshot repository"
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: vault-snapshot-s3
|
name: vault-snapshot-s3
|
||||||
|
Reference in New Issue
Block a user