enable valkey cache

clusters/cl01tl/platform/gitea/Chart.yaml

@@ -21,14 +21,17 @@ dependencies:
   - name: gitea
     version: 11.0.0
     repository: https://dl.gitea.io/charts/
-  - name: cloudflared
-    alias: cloudflared
-    repository: http://alexlebens.github.io/helm-charts
-    version: 1.14.2
   - name: app-template
     alias: backup
     repository: https://bjw-s.github.io/helm-charts/
     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
     alias: postgres-17-cluster
     version: 4.2.1

clusters/cl01tl/platform/gitea/templates/external-secret.yaml

@@ -117,6 +117,13 @@ spec:
         key: /digital-ocean/home-infra/gitea-backup
         metadataPolicy: None
         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

clusters/cl01tl/platform/gitea/values.yaml

@@ -59,6 +59,9 @@ gitea:
         SCHEMA: public
       oauth2_client:
         ENABLE_AUTO_REGISTRATION: true
+      cache:
+        ADAPTER: redis
+        HOST: redis://gitea-valkey-headless.gitea:6379
       service:
         REGISTER_MANUAL_CONFIRM: true
         SHOW_REGISTRATION_BUTTON: false
@@ -91,7 +94,7 @@ gitea:
             name: gitea-postgresql-17-cluster-app
             key: password
   memcached:
-    enabled: true
+    enabled: false
   redis:
     enabled: false
   redis-cluster:
@@ -104,8 +107,6 @@ gitea:
     enabled: false
   mariadb:
     enabled: false
-cloudflared:
-  existingSecretName: gitea-cloudflared-secret
 backup:
   global:
     fullnameOverride: gitea-backup
@@ -150,8 +151,10 @@ backup:
           args:
             - -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;
+              echo ">> Completed S3 backup for Gitea"
           envFrom:
             - secretRef:
                 name: gitea-backup-s3
@@ -170,12 +173,14 @@ backup:
             - -ec
             - |
               export WEEK_AGO=$(date -d @$(( $(date +%s) - 604800 )) +%Y-%m-%d\ %H:%M:%S);
-
-              s3cmd ls -v s3://gitea-backups-8ba8dae3674a2f53354c600e/cl01tl/cl01tl-gitea-backups/ |
+              echo ">> Running S3 prune for Gitea backup repository"
+              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}' |
                 while read file;
                   do s3cmd del -v "$file";
                 done;
+              echo ">> Completed S3 prune for Gitea backup repository"
           envFrom:
             - secretRef:
                 name: gitea-backup-s3
@@ -209,6 +214,20 @@ backup:
               readOnly: true
               mountPropagation: None
               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:
   mode: standalone
   cluster:

clusters/cl01tl/platform/vault/values.yaml

@@ -178,10 +178,12 @@ snapshot:
             - -ec
             - |
               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);
               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-s3.snap;
+              echo ">> Completed Vault snapshot"
           envFrom:
             - secretRef:
                 name: vault-snapshot-agent-token
@@ -203,8 +205,10 @@ snapshot:
           args:
             - -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;
               rm -f /opt/backup/vault-snapshot-s3.snap;
+              echo ">> Completed S3 backup for Vault snapshot"
           envFrom:
             - secretRef:
                 name: vault-snapshot-s3
@@ -223,12 +227,14 @@ snapshot:
             - -ec
             - |
               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 |
                 awk -v month_ago="$MONTH_AGO" '$1 < month_ago {print $4}' |
                 while read file;
                   do s3cmd del -v "$file";
                 done;
+              echo ">> Completed S3 prune for Vault snapshot repository"
           envFrom:
             - secretRef:
                 name: vault-snapshot-s3