Update Helm release generic-device-plugin to v0.4.0

.gitea/workflows/lint-test-docker.yaml

@@ -1,141 +1,80 @@
 name: lint-test-docker
 
 on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'hosts/**'
-
   push:
     branches:
       - main
     paths:
       - 'hosts/**'
+      - ! 'hosts/archive'
 
-env:
+  pull_request:
-  BASE_BRANCH: "origin/${{ gitea.base_ref }}"
+    branches:
+      - main
+    paths:
+      - 'hosts/**'
+      - ! 'hosts/archive'
 
 jobs:
-  lint-docker-compose:
+  docker-lint:
-    runs-on: ubuntu-js
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Check Branch Exists
         id: check-branch-exists
-        if: github.event_name == 'pull_request'
         uses: GuillaumeFalourd/branch-exists@v1.1
         with:
-          branch: "${{ github.base_ref }}"
+          branch: "origin/${{ github.base_ref }}"
 
-      - name: Report Branch Exists
+      - name: Branch Does Not Exist
-        id: branch-exists
+        if: steps.check-branch-exists.outputs.exists == 'false'
-        if: github.event_name == 'push' || steps.check-branch-exists.outputs.exists == 'true' && github.event_name == 'pull_request'
+        run: echo "Branch origin/${{ github.base_ref }} was not found, likely already merged"
-        run: |
-          if [ ${{ github.event_name == 'push' }} ]; then
-            echo ">> Action is from a push event, will continue with linting"
 
-          else
-            echo ">> Branch ${{ gitea.base_ref }} exists, will continue with linting"
-
-          fi
-
-          echo "----"
-
-          echo "exists=true" >> $GITEA_OUTPUT
 
       - name: Set up Node.js
-        if: steps.branch-exists.outputs.exists == 'true'
+        if: steps.check-branch-exists.outputs.exists == 'true'
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version: '24'
+          node-version: '22'
-
-      - name: Check Directories for Changes
-        id: check-dir-changes
-        if: steps.branch-exists.outputs.exists == 'true'
-        run: |
-          CHANGED_COMPOSE=()
-
-          echo ">> Target branch for diff is: ${BASE_BRANCH}"
-
-          if [ "${{ github.event_name }}" == "pull_request" ]; then
-            echo ""
-            echo ">> Checking for changes in a pull request ..."
-            GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u)
-          else
-            echo ""
-            echo ">> Checking for changes from a push ..."
-            GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u)
-          fi
-
-          if [ -n "${GIT_DIFF}" ]; then
-            echo ""
-            echo ">> Changes detected:"
-            echo "$GIT_DIFF"
-
-            for path in $GIT_DIFF; do
-              if echo "$path" | grep -q -E "hosts/[^/]+/[^/]+"; then
-                echo ""
-                echo ">> Adding path: $path"
-                CHANGED_COMPOSE+=$(echo "$path")
-                CHANGED_COMPOSE+=$(echo " ")
-              fi
-            done
-
-          else
-            echo ""
-            echo ">> No changes detected"
-
-          fi
-
-          if [ -n "${CHANGED_COMPOSE}" ]; then
-            echo ""
-            echo ">> Compose to Lint:"
-            echo "$(echo "${CHANGED_COMPOSE}" | sort -u)"
-
-            echo "----"
-
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-            echo "compose-dir<<EOF" >> $GITEA_OUTPUT
-            echo "$(echo "${CHANGED_COMPOSE}" | sort -u)" >> $GITEA_OUTPUT
-            echo "EOF" >> $GITEA_OUTPUT
-          else
-            echo ""
-            echo ">> Did not find any docker compose files to lint"
-
-            echo "----"
-
-            echo "changes-detected=false" >> $GITEA_OUTPUT
-          fi
 
       - name: Lint Docker Compose
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
+        if: steps.check-branch-exists.outputs.exists == 'true'
-        env:
-          CHANGED_COMPOSE: ${{ steps.check-dir-changes.outputs.compose-dir }}
         run: |
+          set -e  # Exit immediately if a command exits with a non-zero status.
+
+          TARGET_BRANCH="origin/${{ github.base_ref }}"
+          echo ">> Target branch for diff is: $TARGET_BRANCH"
+
+          CHANGED_FILES=$(git diff --name-only "$TARGET_BRANCH" -- 'hosts/**')
+
+          echo ">> Found changed files:"
+          echo "$CHANGED_FILES"
+
+          # For each changed file, find its parent chart directory (the one with compose.yaml).
+          # Then, create a unique list of those directories.
+          CHANGED_COMPOSE=$(echo "$CHANGED_FILES" | while read -r file; do
+            dir=$(dirname "$file")
+            while [[ "$dir" != "." && ! -f "$dir/compose.yaml" ]]; do
+              dir=$(dirname "$dir")
+            done
+            if [[ "$dir" != "." ]]; then
+              echo "$dir"
+            fi
+          done | sort -u)
+
+          if [[ -z "$CHANGED_COMPOSE" ]]; then
+            echo ">> Could not determine changed compose files. This will happen if only files outside a compose file were changed."
+            exit 0
+          fi
+
           echo ">> Running dclint on changed compose files:"
           echo "$CHANGED_COMPOSE"
 
-          for compose in $CHANGED_COMPOSE; do
+          echo "$CHANGED_COMPOSE" | while read -r compose; do
             echo ">> Linting $compose ..."
             npx dclint $compose
           done
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Test Failure - Infrastructure'
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: 'Docker linting on Pull Request for Infrastructure has failed!'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/infrastructure/actions?workflow=lint-test-docker-pull.yaml", "clear": true}]'
-          image: true

.gitea/workflows/lint-test-helm.yaml

@@ -1,187 +1,82 @@
 name: lint-test-helm
 
 on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'clusters/cl01tl/helm/**'
-
   push:
     branches:
       - main
     paths:
-      - 'clusters/cl01tl/helm/**'
+      - 'clusters/**'
+      - ! 'clusters/*/archive'
 
-env:
+  pull_request:
-  CLUSTER: cl01tl
+    branches:
-  BASE_BRANCH: "origin/${{ gitea.base_ref }}"
+      - main
+    paths:
+      - 'clusters/**'
+      - ! 'clusters/*/archive'
 
 jobs:
-  lint-helm:
+  helm-lint:
-    runs-on: ubuntu-js
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Check Branch Exists
         id: check-branch-exists
-        if: github.event_name == 'pull_request'
         uses: GuillaumeFalourd/branch-exists@v1.1
         with:
-          branch: ${{ gitea.base_ref }}
+          branch: "origin/${{ github.base_ref }}"
 
-      - name: Report Branch Exists
+      - name: Branch Does Not Exist
-        id: branch-exists
+        if: steps.check-branch-exists.outputs.exists == 'false'
-        if: github.event_name == 'push' || steps.check-branch-exists.outputs.exists == 'true' && github.event_name == 'pull_request'
+        run: echo "Branch origin/${{ github.base_ref }} was not found, likely already merged"
-        run: |
-          if [ ${{ github.event_name == 'push' }} ]; then
-            echo ">> Action is from a push event, will continue with linting"
-
-          else
-            echo ">> Branch ${{ gitea.base_ref }} exists, will continue with linting"
-
-          fi
-
-          echo "----"
-
-          echo "exists=true" >> $GITEA_OUTPUT
 
       - name: Set up Helm
-        if: steps.branch-exists.outputs.exists == 'true'
+        if: steps.check-branch-exists.outputs.exists == 'true'
         uses: azure/setup-helm@v4
         with:
           token: ${{ secrets.GITEA_TOKEN }}
-          version: v3.19.2
+          version: latest
-
-      - name: Check Directories for Changes
-        id: check-dir-changes
-        if: steps.branch-exists.outputs.exists == 'true'
-        run: |
-          CHANGED_CHARTS=()
-
-          echo ">> Target branch for diff is: ${BASE_BRANCH}"
-
-          if [ "${{ github.event_name }}" == "pull_request" ]; then
-            echo ""
-            echo ">> Checking for changes in a pull request ..."
-            GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u)
-          else
-            echo ""
-            echo ">> Checking for changes from a push ..."
-            GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u)
-          fi
-
-          if [ -n "${GIT_DIFF}" ]; then
-            echo ""
-            echo ">> Changes detected:"
-            echo "$GIT_DIFF"
-
-            for path in $GIT_DIFF; do
-              if echo "$path" | grep -q -E "clusters/[^/]+/helm/[^/]+"; then
-                echo ""
-                echo ">> Adding path: $path"
-                CHANGED_CHARTS+=$(echo "$path" | awk -F '/' '{print $4}')
-                CHANGED_CHARTS+=$(echo "\n")
-              fi
-            done
-
-          else
-            echo ""
-            echo ">> No changes detected"
-
-          fi
-
-          if [ -n "${CHANGED_CHARTS}" ]; then
-            echo ""
-            echo ">> Chart to Lint:"
-            echo "$(echo "${CHANGED_CHARTS}" | sort -u)"
-
-            echo "----"
-
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-            echo "chart-dir<<EOF" >> $GITEA_OUTPUT
-            echo "$(echo "${CHANGED_CHARTS}" | sort -u)" >> $GITEA_OUTPUT
-            echo "EOF" >> $GITEA_OUTPUT
-          else
-            echo ""
-            echo ">> Did not find any helm charts files to lint"
-
-            echo "----"
-
-            echo "changes-detected=false" >> $GITEA_OUTPUT
-          fi
-
-      - name: Add Repositories
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          CHANGED_CHARTS: ${{ steps.check-dir-changes.outputs.chart-dir }}
-        run: |
-          echo ">> Adding repositories for chart dependencies ..."
-          for dir in ${CHANGED_CHARTS}; do
-            helm dependency list --max-col-width 120 clusters/${CLUSTER}/helm/$dir 2> /dev/null \
-              | tail +2 | head -n -1 \
-              | awk '{ print "helm repo add " $1 " " $3 }' \
-              | while read cmd; do
-                if [[ "$cmd" == "*oci://*" ]]; then
-                  echo ">> Ignoring OCI repo"
-                else
-                  echo ">> Command: $cmd"
-                  echo "$cmd" | sh;
-                fi
-              done || true
-          done
-
-          if helm repo list | tail +2 | read -r; then
-            echo ""
-            echo ">> Update repository cache ..."
-            helm repo update
-          fi
-
-          echo "----"
 
       - name: Lint Helm Chart
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
+        if: steps.check-branch-exists.outputs.exists == 'true'
-        env:
-          CHANGED_CHARTS: ${{ steps.check-dir-changes.outputs.chart-dir }}
         run: |
-          echo ">> Running linting on changed charts ..."
+          set -e  # Exit immediately if a command exits with a non-zero status.
 
-          for dir in ${CHANGED_CHARTS}; do
+          TARGET_BRANCH="origin/${{ github.base_ref }}"
-            chart_path=clusters/${CLUSTER}/helm/$dir
+          echo ">> Target branch for diff is: $TARGET_BRANCH"
-            chart_name=$(basename "$chart_path")
 
-            if [ -f "$chart_path/Chart.yaml" ]; then
+          CHANGED_FILES=$(git diff --name-only "$TARGET_BRANCH" -- 'clusters/**')
-              cd $chart_path
 
-              echo ""
+          echo ">> Found changed files:"
-              echo ">> Building helm dependency ..."
+          echo "$CHANGED_FILES"
-              helm dependency build --skip-refresh
 
-              echo ""
+          # For each changed file, find its parent chart directory (the one with Chart.yaml).
-              echo ">> Linting helm ..."
+          # Then, create a unique list of those directories.
-              helm lint --namespace "$chart_name"
+          CHANGED_CHARTS=$(echo "$CHANGED_FILES" | while read -r file; do
-
+            dir=$(dirname "$file")
-            else
+            while [[ "$dir" != "." && ! -f "$dir/Chart.yaml" ]]; do
-              echo ""
+              dir=$(dirname "$dir")
-              echo ">> Directory $chart_path does not contain a Chart.yaml. Skipping ..."
+            done
-              echo ""
+            if [[ "$dir" != "." ]]; then
+              echo "$dir"
             fi
-          done
+          done | sort -u)
 
-      - name: ntfy Failed
+          if [[ -z "$CHANGED_CHARTS" ]]; then
-        uses: niniyas/ntfy-action@master
+            echo ">> Could not determine changed charts. This could happen if only files outside a chart were changed."
-        if: failure()
+            exit 0
-        with:
+          fi
-          url: '${{ secrets.NTFY_URL }}'
+
-          topic: '${{ secrets.NTFY_TOPIC }}'
+          echo ">> Running helm lint on changed charts:"
-          title: 'Test Failure - Infrastructure'
+          echo "$CHANGED_CHARTS"
-          priority: 3
+
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          echo "$CHANGED_CHARTS" | while read -r chart; do
-          tags: action,failed
+            echo ">> Building dependency for "$chart" ..."
-          details: 'Helm linting on Pull Request for Infrastructure has failed!'
+            helm dependency build "$chart"
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+            echo ">> Linting $chart..."
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/infrastructure/actions?workflow=lint-test-helm-pull.yaml", "clear": true}]'
+            helm lint "$chart"
-          image: true
+          done

.gitea/workflows/process-issues.yaml

@@ -0,0 +1,35 @@
+name: process-issues
+
+on:
+  schedule:
+    - cron: '@daily'
+
+jobs:
+  process-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Python Script
+        uses: actions/checkout@v4
+        with:
+          repository: alexlebens/workflow-scripts
+          ref: main
+          token: ${{ secrets.BOT_TOKEN }}
+          path: scripts
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Run Script
+        env:
+          INSTANCE_URL: ${{ vars.INSTANCE_URL }}
+          REPOSITORY: ${{ gitea.repository }}
+          TOKEN: ${{ secrets.BOT_TOKEN }}
+          STALE_DAYS: 3
+          STALE_TAG: 16
+          EXCLUDE_TAG: 20
+        run: python ./scripts/scripts/process-issues.py

.gitea/workflows/process-pull-requests.yaml

@@ -0,0 +1,35 @@
+name: process-pull-requests
+
+on:
+  schedule:
+    - cron: '@daily'
+
+jobs:
+  process-pull-requests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Python Script
+        uses: actions/checkout@v4
+        with:
+          repository: alexlebens/workflow-scripts
+          ref: main
+          token: ${{ secrets.BOT_TOKEN }}
+          path: scripts
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Run Script
+        env:
+          INSTANCE_URL: ${{ vars.INSTANCE_URL }}
+          REPOSITORY: ${{ gitea.repository }}
+          TOKEN: ${{ secrets.BOT_TOKEN }}
+          STALE_DAYS: 3
+          STALE_TAG: 16
+          REQUIRED_TAG: 15
+        run: python ./scripts/scripts/process-pull-requests.py

.gitea/workflows/render-manifests-automerge.yaml

@@ -1,433 +0,0 @@
-name: render-manifests-automerge
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'clusters/cl01tl/helm/**'
-    types:
-      - closed
-
-env:
-  CLUSTER: cl01tl
-  BASE_BRANCH: manifests
-  BRANCH_NAME_BASE: auto/update-manifests-automerge
-  MAIN_DIR: /workspace/alexlebens/infrastructure/infrastructure
-  MANIFEST_DIR: /workspace/alexlebens/infrastructure/infrastructure-manifests
-
-jobs:
-  render-manifests-automerge:
-    runs-on: ubuntu-js
-    if: ${{ (github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'automerge')) }}
-    steps:
-      - name: Checkout Main
-        uses: actions/checkout@v6
-        with:
-          path: infrastructure
-          fetch-depth: 0
-
-      - name: Checkout Manifests
-        uses: actions/checkout@v6
-        with:
-          ref: manifests
-          path: infrastructure-manifests
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v4
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}
-          version: v3.17.2 # Pending https://github.com/helm/helm/pull/30743
-
-      - name: Prepare Manifest Branch
-        id: prepare-manifest-branch
-        run: |
-          cd ${MANIFEST_DIR}
-
-          BRANCH_NAME="${BRANCH_NAME_BASE}-$(date +%Y%m%d%H%M%S)"
-
-          echo ">> Configure git to use gitea-bot as user ..."
-          git config user.name "gitea-bot"
-          git config user.email "gitea-bot@alexlebens.net"
-
-          echo ">> Creating branch ..."
-          git checkout -b $BRANCH_NAME
-
-          echo "----"
-
-          echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITEA_OUTPUT
-
-      - name: Check which Directories have Changes
-        id: check-dir-changes
-        run: |
-          cd ${MAIN_DIR}
-
-          RENDER_DIR=()
-
-          echo ">> Checking for changes from HEAD^..HEAD ..."
-          GIT_DIFF=$(git diff --name-only HEAD^..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+")
-
-          if [ -n "${GIT_DIFF}" ]; then
-            echo ">> Changes detected:"
-            echo "$GIT_DIFF"
-            for path in $GIT_DIFF; do
-              RENDER_DIR+=$(echo "$path" | awk -F '/' '{print $4}')
-              RENDER_DIR+=$(echo " ")
-            done
-
-          else
-            echo ">> No changes detected"
-
-          fi
-
-          if [ -n "${RENDER_DIR}" ]; then
-            echo ">> Directories to Render:"
-            echo "$(echo "${RENDER_DIR}" | sort -u)"
-
-            echo "----"
-
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-            echo "render-dir<<EOF" >> $GITEA_OUTPUT
-            echo "$(echo "${RENDER_DIR}" | sort -u)" >> $GITEA_OUTPUT
-            echo "EOF" >> $GITEA_OUTPUT
-          else
-            echo "changes-detected=false" >> $GITEA_OUTPUT
-          fi
-
-      - name: Add Repositories
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Adding repositories for chart dependencies ..."
-          for dir in ${RENDER_DIR}; do
-            helm dependency list --max-col-width 120 ${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir 2> /dev/null \
-              | tail +2 | head -n -1 \
-              | awk '{ print "helm repo add " $1 " " $3 }' \
-              | while read cmd; do
-                if [[ "$cmd" == "*oci://*" ]]; then
-                  echo ">> Ignoring OCI repo"
-                else
-                  echo "$cmd" | sh;
-                fi
-              done || true
-          done
-
-          if helm repo list | tail +2 | read -r; then
-            echo ">> Update repository cache ..."
-            helm repo update
-          fi
-
-          echo "----"
-
-      - name: Remove Changed Manifest Files
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Remove manfiest files and rebuild from source ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$dir
-
-            echo "$chart_path"
-            rm -rf $chart_path/*
-          done
-
-          echo "----"
-
-      - name: Render Helm Manifests
-        id: render-manifests
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Rendering Manifests ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
-            chart_name=$(basename "$chart_path")
-
-            echo ""
-            echo ""
-            echo ">> Rendering chart: $chart_name"
-            echo ">> Chart path $chart_path"
-
-            if [ -f "$chart_path/Chart.yaml" ]; then
-              OUTPUT_FOLDER="${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name/"
-              TEMPLATE=""
-
-              mkdir -p ${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name
-
-              cd $chart_path
-
-              echo ""
-              echo ">> Updating helm dependency ..."
-              helm dependency update --skip-refresh
-
-              echo ""
-              echo ">> Building helm dependency ..."
-              helm dependency build --skip-refresh
-
-              echo ""
-              echo ">> Linting helm ..."
-              helm lint --namespace "$chart_name"
-
-              echo ""
-              echo ">> Rendering templates ..."
-              case "$chart_name" in
-                "stack")
-                  echo ""
-                  echo ">> Special Rendering for stack into argocd namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace argocd --include-crds --dry-run)
-                  ;;
-                "cilium" | "coredns" | "metrics-server" |"prometheus-operator-crds")
-                  echo ""
-                  echo ">> Special Rendering for $chart_name into kube-system namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace kube-system --include-crds --dry-run)
-                  ;;
-                *)
-                  echo ""
-                  echo ">> Standard Rendering for $chart_name ..."
-                  TEMPLATE=$(helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run)
-                  ;;
-              esac
-
-              echo ""
-              echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
-
-              # Strip comments again to ensure formatting correctness
-              for file in "$OUTPUT_FOLDER"/*; do
-                yq -i '... comments=""' $file
-              done
-
-              echo ""
-              echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
-              ls $OUTPUT_FOLDER
-              echo ""
-            else
-              echo ""
-              echo ">> Directory $chart_path does not contain a Chart.yaml. Skipping ..."
-              echo ""
-            fi
-          done
-
-          echo "----"
-
-      - name: Check for Changes
-        id: check-changes
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
-            echo ">> Changes detected"
-            git status --porcelain
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-
-          else
-            echo ">> No changes detected, skipping PR creation"
-
-          fi
-
-          echo "----"
-
-      - name: Commit and Push Changes
-        id: commit-push
-        if: steps.check-changes.outputs.changes-detected == 'true'
-        env:
-          BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.BRANCH_NAME }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Commiting changes to ${BRANCH_NAME} ..."
-          git add .
-          git commit -m "chore: Update manifests after automerge"
-
-          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
-          echo ">> Pushing changes to $REPO_URL ..."
-          git push -u "https://oauth2:${{ secrets.BOT_TOKEN }}@$(echo $REPO_URL | sed -e 's|https://||')" ${BRANCH_NAME}
-
-          echo "----"
-
-          echo "push=true" >> $GITEA_OUTPUT
-
-      - name: Create Pull Request
-        id: create-pull-request
-        if: steps.commit-push.outputs.push == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.BRANCH_NAME }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls"
-
-          PAYLOAD=$( jq -n \
-            --arg head "${BRANCH_NAME}" \
-            --arg base "${BASE_BRANCH}" \
-            --arg title "Automated Manifest Update - Automerge" \
-            --arg body "This PR contains newly rendered Kubernetes manifests automatically generated by the CI workflow. This is expected to be automerged." \
-            '{head: $head, base: $base, title: $title, body: $body}' )
-
-          echo ">> Creating PR from branch ${BRANCH_NAME} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-          echo ">> With Payload of:"
-          echo "$PAYLOAD"
-
-          HTTP_STATUS=$(
-            curl -X POST \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              --data "$PAYLOAD" \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "201" ]; then
-            echo ">> Pull Request created successfully!"
-
-            PR_URL=$(cat response_body.json | jq -r .html_url)
-            echo ">> Pull Request URL: $PR_URL"
-            echo "pull-request-url=${PR_URL}" >> $GITEA_OUTPUT
-
-            PR_NUMBER=$(cat response_body.json | jq -r .number)
-            echo ">> Pull Request Number: $PR_NUMBER"
-            echo "pull-request-number=${PR_NUMBER}" >> $GITEA_OUTPUT
-
-            echo "pull-request-operation=created" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "422" ]; then
-            echo ">> Failed to create PR (HTTP 422: Unprocessable Entity), PR may already exist"
-
-          elif [ "$HTTP_STATUS" == "409" ]; then
-            echo ">> Failed to create PR (HTTP 409: Conflict), PR already exists"
-
-          else
-            echo ">> Failed to create PR, HTTP status code: $HTTP_STATUS"
-            exit 1
-          fi
-
-          echo "----"
-
-      - name: Merge Changes
-        id: merge-changes
-        if: steps.commit-push.outputs.push == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.BRANCH_NAME }}
-          PR_NUMBER: ${{ steps.create-pull-request.outputs.pull-request-number }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls/${PR_NUMBER}/merge"
-
-          PAYLOAD=$( jq -n \
-            --arg Do "merge" \
-            '{Do: $Do}' )
-
-          echo ">> Merging PR with ID: ${PR_NUMBER}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-          echo ">> With Payload of:"
-          echo "$PAYLOAD"
-
-          HTTP_STATUS=$(
-            curl -X POST \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              --data "$PAYLOAD" \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "200" ]; then
-            echo ">> Pull Request merged successfully!"
-            echo "pull-request-operation=merged" >> $GITEA_OUTPUT
-
-          else
-            echo ">> Failed to create PR, HTTP status code: $HTTP_STATUS"
-            echo "pull-request-operation=failed" >> $GITEA_OUTPUT
-            exit 1
-          fi
-
-          echo "----"
-
-      - name: Cleanup Branch
-        if: failure()
-        env:
-          BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.BRANCH_NAME }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Removing branch: ${BRANCH_NAME}"
-          git push origin --delete ${BRANCH_NAME}
-
-          echo "----"
-
-      - name: ntfy Merged
-        uses: niniyas/ntfy-action@master
-        if: steps.merge-changes.outputs.pull-request-operation == 'merged'
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render PR Merged - Infrastructure"
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,successfully,completed
-          details: "Automerge Manifest rendering for Infrastructure!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render Failure - Infrastructure"
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: "Automerge Manifest rendering for Infrastructure has failed!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/infrastructure/actions?workflow=render-manifests-automerge.yaml", "clear": true}]'
-          image: true

.gitea/workflows/render-manifests-dispatch.yaml

@@ -1,398 +0,0 @@
-name: render-manifests-dispatch
-
-on:
-  workflow_dispatch:
-
-env:
-  CLUSTER: cl01tl
-  BASE_BRANCH: manifests
-  BRANCH_NAME: auto/update-manifests
-  ASSIGNEE: alexlebens
-  MAIN_DIR: /workspace/alexlebens/infrastructure/infrastructure
-  MANIFEST_DIR: /workspace/alexlebens/infrastructure/infrastructure-manifests
-
-jobs:
-  render-manifests-dispatch:
-    runs-on: ubuntu-js
-    steps:
-      - name: Checkout Main
-        uses: actions/checkout@v6
-        with:
-          path: infrastructure
-          fetch-depth: 0
-
-      - name: Checkout Manifests
-        uses: actions/checkout@v6
-        with:
-          ref: manifests
-          path: infrastructure-manifests
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v4
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}
-          version: v3.17.2 # Pending https://github.com/helm/helm/pull/30743
-
-      - name: Prepare Manifest Branch
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Configure git to use gitea-bot as user ..."
-          git config user.name "gitea-bot"
-          git config user.email "gitea-bot@alexlebens.net"
-
-          echo ">> Checking if PR branch exists ..."
-          if [[ $(git ls-remote --heads origin "${BRANCH_NAME}" | wc -l) -gt 0 ]]; then
-            echo ">> Branch '${BRANCH_NAME}' exists, pulling changes ..."
-            git fetch origin "${BRANCH_NAME}"
-            git checkout "${BRANCH_NAME}"
-            git pull --rebase
-
-          else
-            echo ">> Branch '${BRANCH_NAME}' does not exist, creating ..."
-            git checkout -b $BRANCH_NAME
-          fi
-
-          echo "----"
-
-      - name: Check which Directories have Changes
-        id: check-dir-changes
-        run: |
-          cd ${MAIN_DIR}
-
-          RENDER_DIR=()
-
-          echo ">> Triggered on dispatch, will check all paths ..."
-          RENDER_DIR+=$(ls clusters/cl01tl/helm/)
-
-          if [ -n "${RENDER_DIR}" ]; then
-            echo ">> Directories to Render:"
-            echo "$(echo "${RENDER_DIR}" | sort -u)"
-
-            echo "----"
-
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-            echo "render-dir<<EOF" >> $GITEA_OUTPUT
-            echo "$(echo "${RENDER_DIR}" | sort -u)" >> $GITEA_OUTPUT
-            echo "EOF" >> $GITEA_OUTPUT
-          else
-            echo "changes-detected=false" >> $GITEA_OUTPUT
-          fi
-
-      - name: Add Repositories
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Adding repositories for chart dependencies ..."
-          for dir in ${RENDER_DIR}; do
-            helm dependency list --max-col-width 120 ${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir 2> /dev/null \
-              | tail +2 | head -n -1 \
-              | awk '{ print "helm repo add " $1 " " $3 }' \
-              | while read cmd; do
-                if [[ "$cmd" == "*oci://*" ]]; then
-                  echo ">> Ignoring OCI repo"
-                else
-                  echo "$cmd" | sh;
-                fi
-              done || true
-          done
-
-          if helm repo list | tail +2 | read -r; then
-            echo ">> Update repository cache ..."
-            helm repo update
-          fi
-
-          echo "----"
-
-      - name: Remove Changed Manifest Files
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Remove manfiest files and rebuild from source ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$dir
-
-            echo "$chart_path"
-            rm -rf $chart_path/*
-          done
-
-          echo "----"
-
-      - name: Render Helm Manifests
-        id: render-manifests
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Rendering Manifests ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
-            chart_name=$(basename "$chart_path")
-
-            echo ""
-            echo ""
-            echo ">> Rendering chart: $chart_name"
-            echo ">> Chart path $chart_path"
-
-            if [ -f "$chart_path/Chart.yaml" ]; then
-              OUTPUT_FOLDER="${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name/"
-              TEMPLATE=""
-
-              mkdir -p ${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name
-
-              cd $chart_path
-
-              echo ""
-              echo ">> Updating helm dependency ..."
-              helm dependency update --skip-refresh
-
-              echo ""
-              echo ">> Building helm dependency ..."
-              helm dependency build --skip-refresh
-
-              echo ""
-              echo ">> Linting helm ..."
-              helm lint --namespace "$chart_name"
-
-              echo ""
-              echo ">> Rendering templates ..."
-              case "$chart_name" in
-                "stack")
-                  echo ""
-                  echo ">> Special Rendering for stack into argocd namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace argocd --include-crds --dry-run)
-                  ;;
-                "cilium" | "coredns" | "metrics-server" |"prometheus-operator-crds")
-                  echo ""
-                  echo ">> Special Rendering for $chart_name into kube-system namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace kube-system --include-crds --dry-run)
-                  ;;
-                *)
-                  echo ""
-                  echo ">> Standard Rendering for $chart_name ..."
-                  TEMPLATE=$(helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run)
-                  ;;
-              esac
-
-              echo ""
-              echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
-
-              # Strip comments again to ensure formatting correctness
-              for file in "$OUTPUT_FOLDER"/*; do
-                yq -i '... comments=""' $file
-              done
-
-              echo ""
-              echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
-              ls $OUTPUT_FOLDER
-              echo ""
-            else
-              echo ""
-              echo ">> Directory $chart_path does not contain a Chart.yaml. Skipping ..."
-              echo ""
-            fi
-          done
-
-          echo "----"
-
-      - name: Check for Changes
-        id: check-changes
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
-            echo ">> Changes detected"
-            git status --porcelain
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-
-          else
-            echo ">> No changes detected, skipping PR creation"
-
-          fi
-
-          echo "----"
-
-      - name: Commit and Push Changes
-        id: commit-push
-        if: steps.check-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Commiting changes to ${BRANCH_NAME} ..."
-          git add .
-          git commit -m "chore: Update manifests after change"
-
-          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
-          echo ">> Pushing changes to $REPO_URL ..."
-          git push -u "https://oauth2:${{ secrets.BOT_TOKEN }}@$(echo $REPO_URL | sed -e 's|https://||')" ${BRANCH_NAME}
-
-          echo "----"
-
-          echo "HEAD_BRANCH=${BRANCH_NAME}" >> $GITEA_OUTPUT
-          echo "push=true" >> $GITEA_OUTPUT
-
-      - name: Check for Pull Request
-        id: check-for-pull-requst
-        if: steps.commit-push.outputs.push == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls?base_branch=${BASE_BRANCH}&state=open&page=1"
-
-          echo ">> Checking if PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-
-          HTTP_STATUS=$(
-            curl -X GET \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "open" ]; then
-            echo ">> Pull Request has been found open, will update"
-            PR_INDEX=$(cat response_body.json | jq -r .[0].number)
-            echo "pull-request-exists=${PR_INDEX}" >> $GITEA_OUTPUT
-            echo "pull-request-index=true" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "closed" ]; then
-            echo ">> Pull Request found, but was closed"
-            echo "pull-request-exists=false" >> $GITEA_OUTPUT
-
-          else
-            echo ">> Pull Request not found"
-            echo "pull-request-exists=false" >> $GITEA_OUTPUT
-          fi
-
-          echo "----"
-
-      - name: Create Pull Request
-        id: create-pull-request
-        if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-requst.outputs.pull-request-exists == 'false'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls"
-
-          PAYLOAD=$( jq -n \
-            --arg head "${HEAD_BRANCH}" \
-            --arg base "${BASE_BRANCH}" \
-            --arg assignee "${ASSIGNEE}" \
-            --arg title "Automated Manifest Update" \
-            --arg body "This PR contains newly rendered Kubernetes manifests automatically generated by the CI workflow." \
-            '{head: $head, base: $base, assignee: $assignee, title: $title, body: $body}' )
-
-          echo ">> Creating PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-          echo ">> With Payload of:"
-          echo "$PAYLOAD"
-
-          HTTP_STATUS=$(
-            curl -X POST \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              --data "$PAYLOAD" \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "201" ]; then
-            echo ">> Pull Request created successfully!"
-            PR_URL=$(cat response_body.json | jq -r .html_url)
-            echo "pull-request-url=${PR_URL}" >> $GITEA_OUTPUT
-            PR_ID=$(cat response_body.json | jq -r .id)
-            echo "pull-request-id=${PR_ID}" >> $GITEA_OUTPUT
-            echo "pull-request-operation=created" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "422" ]; then
-            echo ">> Failed to create PR (HTTP 422: Unprocessable Entity), PR may already exist"
-
-          elif [ "$HTTP_STATUS" == "409" ]; then
-            echo ">> Failed to create PR (HTTP 409: Conflict), PR already exists"
-
-          else
-            echo ">> Failed to create PR, HTTP status code: $HTTP_STATUS"
-            exit 1
-          fi
-
-          echo "----"
-
-      - name: ntfy Created
-        uses: niniyas/ntfy-action@master
-        if: steps.create-pull-request.outputs.pull-request-operation == 'created'
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render PR Created - Infrastructure"
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,successfully,completed
-          details: "Manifest rendering for Infrastructure has created a new Pull Request with ID: ${{ steps.create-pull-request.outputs.pull-request-id }}!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render Failure - Infrastructure"
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: "Manifest rendering for Infrastructure has failed!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/infrastructure/actions?workflow=render-manifests.yaml", "clear": true}]'
-          image: true

.gitea/workflows/render-manifests-merge.yaml

@@ -1,418 +0,0 @@
-name: render-manifests-merge
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'clusters/cl01tl/helm/**'
-    types:
-      - closed
-
-env:
-  CLUSTER: cl01tl
-  BASE_BRANCH: manifests
-  BRANCH_NAME: auto/update-manifests
-  ASSIGNEE: alexlebens
-  MAIN_DIR: /workspace/alexlebens/infrastructure/infrastructure
-  MANIFEST_DIR: /workspace/alexlebens/infrastructure/infrastructure-manifests
-
-jobs:
-  render-manifests-merge:
-    runs-on: ubuntu-js
-    if: ${{ (github.event.pull_request.merged == true) && !(contains(github.event.pull_request.labels.*.name, 'automerge')) }}
-    steps:
-      - name: Checkout Main
-        uses: actions/checkout@v6
-        with:
-          path: infrastructure
-          fetch-depth: 0
-
-      - name: Checkout Manifests
-        uses: actions/checkout@v6
-        with:
-          ref: manifests
-          path: infrastructure-manifests
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v4
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}
-          version: v3.17.2 # Pending https://github.com/helm/helm/pull/30743
-
-      - name: Prepare Manifest Branch
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Configure git to use gitea-bot as user ..."
-          git config user.name "gitea-bot"
-          git config user.email "gitea-bot@alexlebens.net"
-
-          echo ">> Checking if PR branch exists ..."
-          if [[ $(git ls-remote --heads origin "${BRANCH_NAME}" | wc -l) -gt 0 ]]; then
-            echo ">> Branch '${BRANCH_NAME}' exists, pulling changes ..."
-            git fetch origin "${BRANCH_NAME}"
-            git checkout "${BRANCH_NAME}"
-            git pull --rebase
-
-          else
-            echo ">> Branch '${BRANCH_NAME}' does not exist, creating ..."
-            git checkout -b $BRANCH_NAME
-          fi
-
-          echo "----"
-
-      - name: Check which Directories have Changes
-        id: check-dir-changes
-        run: |
-          cd ${MAIN_DIR}
-
-          RENDER_DIR=()
-
-          echo ">> Checking for changes from HEAD^..HEAD ..."
-          GIT_DIFF=$(git diff --name-only HEAD^..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+")
-
-          if [ -n "${GIT_DIFF}" ]; then
-            echo ">> Changes detected:"
-            echo "$GIT_DIFF"
-            for path in $GIT_DIFF; do
-              RENDER_DIR+=$(echo "$path" | awk -F '/' '{print $4}')
-              RENDER_DIR+=$(echo " ")
-            done
-
-          else
-            echo ">> No changes detected"
-
-          fi
-
-          if [ -n "${RENDER_DIR}" ]; then
-            echo ">> Directories to Render:"
-            echo "$(echo "${RENDER_DIR}" | sort -u)"
-
-            echo "----"
-
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-            echo "render-dir<<EOF" >> $GITEA_OUTPUT
-            echo "$(echo "${RENDER_DIR}" | sort -u)" >> $GITEA_OUTPUT
-            echo "EOF" >> $GITEA_OUTPUT
-          else
-            echo "changes-detected=false" >> $GITEA_OUTPUT
-          fi
-
-      - name: Add Repositories
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Adding repositories for chart dependencies ..."
-          for dir in ${RENDER_DIR}; do
-            helm dependency list --max-col-width 120 ${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir 2> /dev/null \
-              | tail +2 | head -n -1 \
-              | awk '{ print "helm repo add " $1 " " $3 }' \
-              | while read cmd; do
-                if [[ "$cmd" == "*oci://*" ]]; then
-                  echo ">> Ignoring OCI repo"
-                else
-                  echo "$cmd" | sh;
-                fi
-              done || true
-          done
-
-          if helm repo list | tail +2 | read -r; then
-            echo ">> Update repository cache ..."
-            helm repo update
-          fi
-
-          echo "----"
-
-      - name: Remove Changed Manifest Files
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Remove manfiest files and rebuild from source ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$dir
-
-            echo "$chart_path"
-            rm -rf $chart_path/*
-          done
-
-          echo "----"
-
-      - name: Render Helm Manifests
-        id: render-manifests
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Rendering Manifests ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
-            chart_name=$(basename "$chart_path")
-
-            echo ""
-            echo ""
-            echo ">> Rendering chart: $chart_name"
-            echo ">> Chart path $chart_path"
-
-            if [ -f "$chart_path/Chart.yaml" ]; then
-              OUTPUT_FOLDER="${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name/"
-              TEMPLATE=""
-
-              mkdir -p ${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name
-
-              cd $chart_path
-
-              echo ""
-              echo ">> Updating helm dependency ..."
-              helm dependency update --skip-refresh
-
-              echo ""
-              echo ">> Building helm dependency ..."
-              helm dependency build --skip-refresh
-
-              echo ""
-              echo ">> Linting helm ..."
-              helm lint --namespace "$chart_name"
-
-              echo ""
-              echo ">> Rendering templates ..."
-              case "$chart_name" in
-                "stack")
-                  echo ""
-                  echo ">> Special Rendering for stack into argocd namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace argocd --include-crds --dry-run)
-                  ;;
-                "cilium" | "coredns" | "metrics-server" |"prometheus-operator-crds")
-                  echo ""
-                  echo ">> Special Rendering for $chart_name into kube-system namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace kube-system --include-crds --dry-run)
-                  ;;
-                *)
-                  echo ""
-                  echo ">> Standard Rendering for $chart_name ..."
-                  TEMPLATE=$(helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run)
-                  ;;
-              esac
-
-              echo ""
-              echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
-
-              # Strip comments again to ensure formatting correctness
-              for file in "$OUTPUT_FOLDER"/*; do
-                yq -i '... comments=""' $file
-              done
-
-              echo ""
-              echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
-              ls $OUTPUT_FOLDER
-              echo ""
-            else
-              echo ""
-              echo ">> Directory $chart_path does not contain a Chart.yaml. Skipping ..."
-              echo ""
-            fi
-          done
-
-          echo "----"
-
-      - name: Check for Changes
-        id: check-changes
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
-            echo ">> Changes detected"
-            git status --porcelain
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-
-          else
-            echo ">> No changes detected, skipping PR creation"
-
-          fi
-
-          echo "----"
-
-      - name: Commit and Push Changes
-        id: commit-push
-        if: steps.check-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Commiting changes to ${BRANCH_NAME} ..."
-          git add .
-          git commit -m "chore: Update manifests after change"
-
-          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
-          echo ">> Pushing changes to $REPO_URL ..."
-          git push -u "https://oauth2:${{ secrets.BOT_TOKEN }}@$(echo $REPO_URL | sed -e 's|https://||')" ${BRANCH_NAME}
-
-          echo "----"
-
-          echo "HEAD_BRANCH=${BRANCH_NAME}" >> $GITEA_OUTPUT
-          echo "push=true" >> $GITEA_OUTPUT
-
-      - name: Check for Pull Request
-        id: check-for-pull-requst
-        if: steps.commit-push.outputs.push == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls?base_branch=${BASE_BRANCH}&state=open&page=1"
-
-          echo ">> Checking if PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-
-          HTTP_STATUS=$(
-            curl -X GET \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "open" ]; then
-            echo ">> Pull Request has been found open, will update"
-            PR_INDEX=$(cat response_body.json | jq -r .[0].number)
-            echo "pull-request-exists=${PR_INDEX}" >> $GITEA_OUTPUT
-            echo "pull-request-index=true" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "closed" ]; then
-            echo ">> Pull Request found, but was closed"
-            echo "pull-request-exists=false" >> $GITEA_OUTPUT
-
-          else
-            echo ">> Pull Request not found"
-            echo "pull-request-exists=false" >> $GITEA_OUTPUT
-          fi
-
-          echo "----"
-
-      - name: Create Pull Request
-        id: create-pull-request
-        if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-requst.outputs.pull-request-exists == 'false'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls"
-
-          PAYLOAD=$( jq -n \
-            --arg head "${HEAD_BRANCH}" \
-            --arg base "${BASE_BRANCH}" \
-            --arg assignee "${ASSIGNEE}" \
-            --arg title "Automated Manifest Update" \
-            --arg body "This PR contains newly rendered Kubernetes manifests automatically generated by the CI workflow." \
-            '{head: $head, base: $base, assignee: $assignee, title: $title, body: $body}' )
-
-          echo ">> Creating PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-          echo ">> With Payload of:"
-          echo "$PAYLOAD"
-
-          HTTP_STATUS=$(
-            curl -X POST \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              --data "$PAYLOAD" \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "201" ]; then
-            echo ">> Pull Request created successfully!"
-            PR_URL=$(cat response_body.json | jq -r .html_url)
-            echo "pull-request-url=${PR_URL}" >> $GITEA_OUTPUT
-            PR_ID=$(cat response_body.json | jq -r .id)
-            echo "pull-request-id=${PR_ID}" >> $GITEA_OUTPUT
-            echo "pull-request-operation=created" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "422" ]; then
-            echo ">> Failed to create PR (HTTP 422: Unprocessable Entity), PR may already exist"
-
-          elif [ "$HTTP_STATUS" == "409" ]; then
-            echo ">> Failed to create PR (HTTP 409: Conflict), PR already exists"
-
-          else
-            echo ">> Failed to create PR, HTTP status code: $HTTP_STATUS"
-            exit 1
-          fi
-
-          echo "----"
-
-      - name: ntfy Created
-        uses: niniyas/ntfy-action@master
-        if: steps.create-pull-request.outputs.pull-request-operation == 'created'
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render PR Created - Infrastructure"
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,successfully,completed
-          details: "Manifest rendering for Infrastructure has created a new Pull Request with ID: ${{ steps.create-pull-request.outputs.pull-request-id }}!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render Failure - Infrastructure"
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: "Manifest rendering for Infrastructure has failed!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/infrastructure/actions?workflow=render-manifests.yaml", "clear": true}]'
-          image: true

.gitea/workflows/render-manifests-push.yaml

@@ -1,416 +0,0 @@
-name: render-manifests-push
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'clusters/cl01tl/helm/**'
-
-env:
-  CLUSTER: cl01tl
-  BASE_BRANCH: manifests
-  BRANCH_NAME: auto/update-manifests
-  ASSIGNEE: alexlebens
-  MAIN_DIR: /workspace/alexlebens/infrastructure/infrastructure
-  MANIFEST_DIR: /workspace/alexlebens/infrastructure/infrastructure-manifests
-
-jobs:
-  render-manifests-push:
-    runs-on: ubuntu-js
-    if: gitea.event.commits[0].author.username != 'renovate-bot'
-    steps:
-      - name: Checkout Main
-        uses: actions/checkout@v6
-        with:
-          path: infrastructure
-          fetch-depth: 0
-
-      - name: Checkout Manifests
-        uses: actions/checkout@v6
-        with:
-          ref: manifests
-          path: infrastructure-manifests
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v4
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}
-          version: v3.17.2 # Pending https://github.com/helm/helm/pull/30743
-
-      - name: Prepare Manifest Branch
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Configure git to use gitea-bot as user ..."
-          git config user.name "gitea-bot"
-          git config user.email "gitea-bot@alexlebens.net"
-
-          echo ">> Checking if PR branch exists ..."
-          if [[ $(git ls-remote --heads origin "${BRANCH_NAME}" | wc -l) -gt 0 ]]; then
-            echo ">> Branch '${BRANCH_NAME}' exists, pulling changes ..."
-            git fetch origin "${BRANCH_NAME}"
-            git checkout "${BRANCH_NAME}"
-            git pull --rebase
-
-          else
-            echo ">> Branch '${BRANCH_NAME}' does not exist, creating ..."
-            git checkout -b $BRANCH_NAME
-          fi
-
-          echo "----"
-
-      - name: Check which Directories have Changes
-        id: check-dir-changes
-        run: |
-          cd ${MAIN_DIR}
-
-          RENDER_DIR=()
-
-          echo ">> Checking for changes ..."
-          GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+")
-
-          if [ -n "${GIT_DIFF}" ]; then
-            echo ">> Changes detected:"
-            echo "$GIT_DIFF"
-            for path in $GIT_DIFF; do
-              RENDER_DIR+=$(echo "$path" | awk -F '/' '{print $4}')
-              RENDER_DIR+=$(echo " ")
-            done
-
-          else
-            echo ">> No changes detected"
-
-          fi
-
-          if [ -n "${RENDER_DIR}" ]; then
-            echo ">> Directories to Render:"
-            echo "$(echo "${RENDER_DIR}" | sort -u)"
-
-            echo "----"
-
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-            echo "render-dir<<EOF" >> $GITEA_OUTPUT
-            echo "$(echo "${RENDER_DIR}" | sort -u)" >> $GITEA_OUTPUT
-            echo "EOF" >> $GITEA_OUTPUT
-          else
-            echo "changes-detected=false" >> $GITEA_OUTPUT
-          fi
-
-      - name: Add Repositories
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Adding repositories for chart dependencies ..."
-          for dir in ${RENDER_DIR}; do
-            helm dependency list --max-col-width 120 ${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir 2> /dev/null \
-              | tail +2 | head -n -1 \
-              | awk '{ print "helm repo add " $1 " " $3 }' \
-              | while read cmd; do
-                if [[ "$cmd" == "*oci://*" ]]; then
-                  echo ">> Ignoring OCI repo"
-                else
-                  echo "$cmd" | sh;
-                fi
-              done || true
-          done
-
-          if helm repo list | tail +2 | read -r; then
-            echo ">> Update repository cache ..."
-            helm repo update
-          fi
-
-          echo "----"
-
-      - name: Remove Changed Manifest Files
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Remove manfiest files and rebuild from source ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$dir
-
-            echo "$chart_path"
-            rm -rf $chart_path/*
-          done
-
-          echo "----"
-
-      - name: Render Helm Manifests
-        id: render-manifests
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        env:
-          RENDER_DIR: ${{ steps.check-dir-changes.outputs.render-dir }}
-        run: |
-          cd ${MAIN_DIR}
-
-          echo ">> Rendering Manifests ..."
-
-          for dir in ${RENDER_DIR}; do
-            chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
-            chart_name=$(basename "$chart_path")
-
-            echo ""
-            echo ""
-            echo ">> Rendering chart: $chart_name"
-            echo ">> Chart path $chart_path"
-
-            if [ -f "$chart_path/Chart.yaml" ]; then
-              OUTPUT_FOLDER="${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name/"
-              TEMPLATE=""
-
-              mkdir -p ${MANIFEST_DIR}/clusters/${CLUSTER}/manifests/$chart_name
-
-              cd $chart_path
-
-              echo ""
-              echo ">> Updating helm dependency ..."
-              helm dependency update --skip-refresh
-
-              echo ""
-              echo ">> Building helm dependency ..."
-              helm dependency build --skip-refresh
-
-              echo ""
-              echo ">> Linting helm ..."
-              helm lint --namespace "$chart_name"
-
-              echo ""
-              echo ">> Rendering templates ..."
-              case "$chart_name" in
-                "stack")
-                  echo ""
-                  echo ">> Special Rendering for stack into argocd namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace argocd --include-crds --dry-run)
-                  ;;
-                "cilium" | "coredns" | "metrics-server" |"prometheus-operator-crds")
-                  echo ""
-                  echo ">> Special Rendering for $chart_name into kube-system namespace ..."
-                  TEMPLATE=$(helm template $chart_name ./ --namespace kube-system --include-crds --dry-run)
-                  ;;
-                *)
-                  echo ""
-                  echo ">> Standard Rendering for $chart_name ..."
-                  TEMPLATE=$(helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run)
-                  ;;
-              esac
-
-              echo ""
-              echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
-
-              # Strip comments again to ensure formatting correctness
-              for file in "$OUTPUT_FOLDER"/*; do
-                yq -i '... comments=""' $file
-              done
-
-              echo ""
-              echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
-              ls $OUTPUT_FOLDER
-              echo ""
-            else
-              echo ""
-              echo ">> Directory $chart_path does not contain a Chart.yaml. Skipping ..."
-              echo ""
-            fi
-          done
-
-          echo "----"
-
-      - name: Check for Changes
-        id: check-changes
-        if: steps.check-dir-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
-            echo ">> Changes detected"
-            git status --porcelain
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-
-          else
-            echo ">> No changes detected, skipping PR creation"
-
-          fi
-
-          echo "----"
-
-      - name: Commit and Push Changes
-        id: commit-push
-        if: steps.check-changes.outputs.changes-detected == 'true'
-        run: |
-          cd ${MANIFEST_DIR}
-
-          echo ">> Commiting changes to ${BRANCH_NAME} ..."
-          git add .
-          git commit -m "chore: Update manifests after change"
-
-          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
-          echo ">> Pushing changes to $REPO_URL ..."
-          git push -u "https://oauth2:${{ secrets.BOT_TOKEN }}@$(echo $REPO_URL | sed -e 's|https://||')" ${BRANCH_NAME}
-
-          echo "----"
-
-          echo "HEAD_BRANCH=${BRANCH_NAME}" >> $GITEA_OUTPUT
-          echo "push=true" >> $GITEA_OUTPUT
-
-      - name: Check for Pull Request
-        id: check-for-pull-requst
-        if: steps.commit-push.outputs.push == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls?base_branch=${BASE_BRANCH}&state=open&page=1"
-
-          echo ">> Checking if PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-
-          HTTP_STATUS=$(
-            curl -X GET \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "open" ]; then
-            echo ">> Pull Request has been found open, will update"
-            PR_INDEX=$(cat response_body.json | jq -r .[0].number)
-            echo "pull-request-exists=${PR_INDEX}" >> $GITEA_OUTPUT
-            echo "pull-request-index=true" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "closed" ]; then
-            echo ">> Pull Request found, but was closed"
-            echo "pull-request-exists=false" >> $GITEA_OUTPUT
-
-          else
-            echo ">> Pull Request not found"
-            echo "pull-request-exists=false" >> $GITEA_OUTPUT
-          fi
-
-          echo "----"
-
-      - name: Create Pull Request
-        id: create-pull-request
-        if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-requst.outputs.pull-request-exists == 'false'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
-        run: |
-          cd ${MANIFEST_DIR}
-
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls"
-
-          PAYLOAD=$( jq -n \
-            --arg head "${HEAD_BRANCH}" \
-            --arg base "${BASE_BRANCH}" \
-            --arg assignee "${ASSIGNEE}" \
-            --arg title "Automated Manifest Update" \
-            --arg body "This PR contains newly rendered Kubernetes manifests automatically generated by the CI workflow." \
-            '{head: $head, base: $base, assignee: $assignee, title: $title, body: $body}' )
-
-          echo ">> Creating PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
-          echo ">> With Endpoint of:"
-          echo "$API_ENDPOINT"
-          echo ">> With Payload of:"
-          echo "$PAYLOAD"
-
-          HTTP_STATUS=$(
-            curl -X POST \
-              --silent \
-              --write-out '%{http_code}' \
-              --output response_body.json \
-              --dump-header response_headers.txt \
-              --data "$PAYLOAD" \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "$API_ENDPOINT" 2> response_errors.txt
-          )
-
-          echo ">> HTTP Status Code: $HTTP_STATUS"
-          echo ">> Response Output ..."
-          echo "----"
-          cat response_body.json
-          echo "----"
-          cat response_headers.txt
-          echo "----"
-          cat response_errors.txt
-          echo "----"
-
-          if [ "$HTTP_STATUS" == "201" ]; then
-            echo ">> Pull Request created successfully!"
-            PR_URL=$(cat response_body.json | jq -r .html_url)
-            echo "pull-request-url=${PR_URL}" >> $GITEA_OUTPUT
-            PR_ID=$(cat response_body.json | jq -r .id)
-            echo "pull-request-id=${PR_ID}" >> $GITEA_OUTPUT
-            echo "pull-request-operation=created" >> $GITEA_OUTPUT
-
-          elif [ "$HTTP_STATUS" == "422" ]; then
-            echo ">> Failed to create PR (HTTP 422: Unprocessable Entity), PR may already exist"
-
-          elif [ "$HTTP_STATUS" == "409" ]; then
-            echo ">> Failed to create PR (HTTP 409: Conflict), PR already exists"
-
-          else
-            echo ">> Failed to create PR, HTTP status code: $HTTP_STATUS"
-            exit 1
-          fi
-
-          echo "----"
-
-      - name: ntfy Created
-        uses: niniyas/ntfy-action@master
-        if: steps.create-pull-request.outputs.pull-request-operation == 'created'
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render PR Created - Infrastructure"
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,successfully,completed
-          details: "Manifest rendering for Infrastructure has created a new Pull Request with ID: ${{ steps.create-pull-request.outputs.pull-request-id }}!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: "${{ secrets.NTFY_URL }}"
-          topic: "${{ secrets.NTFY_TOPIC }}"
-          title: "Manifest Render Failure - Infrastructure"
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: "Manifest rendering for Infrastructure has failed!"
-          icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/infrastructure/actions?workflow=render-manifests.yaml", "clear": true}]'
-          image: true

.gitea/workflows/renovate.yaml

@@ -13,10 +13,10 @@ on:
 jobs:
   renovate:
     runs-on: ubuntu-latest
-    container: ghcr.io/renovatebot/renovate:42
+    container: ghcr.io/renovatebot/renovate:41
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Renovate
         run: renovate

.gitignore

@@ -1,3 +0,0 @@
-/**/archive/
-/**/charts/
-/**/manifests/

clusters/cl01tl/applications/actual/Chart.yaml

@@ -16,10 +16,6 @@ dependencies:
   - name: app-template
     alias: actual
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
-  - name: volsync-target
-    alias: volsync-target-data
-    version: 0.3.0
-    repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/actual-budget.png
-appVersion: 25.12.0
+appVersion: v25.5.0

clusters/cl01tl/applications/actual/templates/external-secret.yaml

@@ -1,10 +1,10 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: seerr-config-backup-secret
+  name: actual-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: seerr-config-backup-secret
+    app.kubernetes.io/name: actual-data-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -16,7 +16,7 @@ spec:
       mergePolicy: Merge
       engineVersion: v2
       data:
-        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/seerr/seerr-config"
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/actual/actual-data"
   data:
     - secretKey: BUCKET_ENDPOINT
       remoteRef:

clusters/cl01tl/applications/actual/templates/replication-source.yaml

@@ -1,19 +1,19 @@
 apiVersion: volsync.backube/v1alpha1
 kind: ReplicationSource
 metadata:
-  name: karakeep-data-backup-source
+  name: actual-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: karakeep-data-backup-source
+    app.kubernetes.io/name: actual-data-backup-source
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  sourcePVC: karakeep
+  sourcePVC: actual-data
   trigger:
     schedule: 0 4 * * *
   restic:
     pruneIntervalDays: 7
-    repository: karakeep-data-backup-secret
+    repository: actual-data-backup-secret
     retain:
       hourly: 1
       daily: 3

clusters/cl01tl/applications/actual/values.yaml

@@ -9,7 +9,7 @@ actual:
         main:
           image:
             repository: ghcr.io/actualbudget/actual
-            tag: 25.12.0
+            tag: 25.7.1
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -54,5 +54,3 @@ actual:
           main:
             - path: /data
               readOnly: false
-volsync-target-data:
-  pvcTarget: actual-data

clusters/cl01tl/applications/audiobookshelf/Chart.yaml

@@ -18,14 +18,6 @@ dependencies:
   - name: app-template
     alias: audiobookshelf
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
-  - name: volsync-target
-    alias: volsync-target-config
-    version: 0.3.0
-    repository: oci://harbor.alexlebens.net/helm-charts
-  - name: volsync-target
-    alias: volsync-target-metadata
-    version: 0.3.0
-    repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/audiobookshelf.png
-appVersion: 2.31.0
+appVersion: 2.21.0

clusters/cl01tl/applications/audiobookshelf/templates/external-secret.yaml

@@ -0,0 +1,135 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: audiobookshelf-apprise-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: audiobookshelf-apprise-config
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ntfy-url
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/audiobookshelf/apprise
+        metadataPolicy: None
+        property: ntfy-url
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: audiobookshelf-config-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: audiobookshelf-config-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/audiobookshelf/audiobookshelf-config"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: audiobookshelf-metadata-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: audiobookshelf-metadata-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/audiobookshelf/audiobookshelf-metadata"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key

clusters/cl01tl/applications/audiobookshelf/templates/persistent-volume-claim.yaml

@@ -1,17 +1,17 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: backrest-nfs-storage
+  name: audiobookshelf-nfs-storage-backup
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: backrest-nfs-storage
+    app.kubernetes.io/name: audiobookshelf-nfs-storage-backup
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  volumeName: backrest-nfs-storage
+  volumeMode: Filesystem
   storageClassName: nfs-client
   accessModes:
-    - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 1Gi
@@ -20,14 +20,14 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: backrest-nfs-share
+  name: audiobookshelf-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: backrest-nfs-share
+    app.kubernetes.io/name: audiobookshelf-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  volumeName: backrest-nfs-share
+  volumeName: audiobookshelf-nfs-storage
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany

clusters/cl01tl/applications/audiobookshelf/templates/replication-source.yaml

@@ -0,0 +1,52 @@
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+  name: audiobookshelf-config-backup-source
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: audiobookshelf-config-backup-source
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  sourcePVC: audiobookshelf-config
+  trigger:
+    schedule: 0 4 * * *
+  restic:
+    pruneIntervalDays: 7
+    repository: audiobookshelf-config-backup-secret
+    retain:
+      hourly: 1
+      daily: 3
+      weekly: 2
+      monthly: 2
+      yearly: 4
+    copyMethod: Snapshot
+    storageClassName: ceph-block
+    volumeSnapshotClassName: ceph-blockpool-snapshot
+
+---
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+  name: audiobookshelf-metadata-backup-source
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: audiobookshelf-metadata-backup-source
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  sourcePVC: audiobookshelf-metadata
+  trigger:
+    schedule: 0 4 * * *
+  restic:
+    pruneIntervalDays: 7
+    repository: audiobookshelf-metadata-backup-secret
+    retain:
+      hourly: 1
+      daily: 3
+      weekly: 2
+      monthly: 2
+      yearly: 4
+    copyMethod: Snapshot
+    storageClassName: ceph-block
+    volumeSnapshotClassName: ceph-blockpool-snapshot

clusters/cl01tl/applications/audiobookshelf/values.yaml

@@ -9,7 +9,7 @@ audiobookshelf:
         main:
           image:
             repository: ghcr.io/advplyr/audiobookshelf
-            tag: 2.31.0
+            tag: 2.25.1
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -21,15 +21,11 @@ audiobookshelf:
         apprise-api:
           image:
             repository: caronc/apprise
-            tag: 1.3.0
+            tag: 1.2.0
             pullPolicy: IfNotPresent
           env:
             - name: TZ
               value: US/Central
-            - name: PGID
-              value: "1000"
-            - name: PUID
-              value: "1000"
             - name: APPRISE_STORAGE_MODE
               value: memory
             - name: APPRISE_STATEFUL_MODE
@@ -59,7 +55,6 @@ audiobookshelf:
           protocol: HTTP
   persistence:
     config:
-      forceRename: audiobookshelf-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 2Gi
@@ -70,7 +65,6 @@ audiobookshelf:
             - path: /config
               readOnly: false
     metadata:
-      forceRename: audiobookshelf-metadata
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 10Gi
@@ -80,6 +74,13 @@ audiobookshelf:
           main:
             - path: /metadata
               readOnly: false
+    backup:
+      existingClaim: audiobookshelf-nfs-storage-backup
+      advancedMounts:
+        main:
+          main:
+            - path: /metadata/backups
+              readOnly: false
     audiobooks:
       existingClaim: audiobookshelf-nfs-storage
       advancedMounts:
@@ -87,7 +88,3 @@ audiobookshelf:
           main:
             - path: /mnt/store/
               readOnly: false
-volsync-target-config:
-  pvcTarget: audiobookshelf-config
-volsync-target-metadata:
-  pvcTarget: audiobookshelf-metadata

clusters/cl01tl/applications/bazarr/Chart.yaml

@@ -18,10 +18,6 @@ dependencies:
   - name: app-template
     alias: bazarr
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
-  - name: volsync-target
-    alias: volsync-target-config
-    version: 0.5.0
-    repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/bazarr.png
-appVersion: 1.5.3
+appVersion: 1.5.2

clusters/cl01tl/applications/bazarr/templates/external-secret.yaml

@@ -0,0 +1,55 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: bazarr-config-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: bazarr-config-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/bazarr/bazarr-config"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key

clusters/cl01tl/applications/bazarr/templates/replication-source.yaml

@@ -0,0 +1,30 @@
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+  name: bazarr-config-backup-source
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: bazarr-config-backup-source
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  sourcePVC: bazarr-config
+  trigger:
+    schedule: 0 4 * * *
+  restic:
+    pruneIntervalDays: 7
+    repository: bazarr-config-backup-secret
+    retain:
+      hourly: 1
+      daily: 3
+      weekly: 2
+      monthly: 2
+      yearly: 4
+    moverSecurityContext:
+      runAsUser: 1000
+      runAsGroup: 1000
+      fsGroup: 1000
+      fsGroupChangePolicy: OnRootMismatch
+    copyMethod: Snapshot
+    storageClassName: ceph-block
+    volumeSnapshotClassName: ceph-blockpool-snapshot

clusters/cl01tl/applications/bazarr/values.yaml

@@ -15,7 +15,7 @@ bazarr:
         main:
           image:
             repository: ghcr.io/linuxserver/bazarr
-            tag: 1.5.3@sha256:4aa1e82d1e96ae712095d881b7e3840e6db6ca862c335be5b00001f31156650b
+            tag: 1.5.2@sha256:a848b8a1d9e3b2553157ceb72cd3fc6ae2b34e71bcece24561b0944fb7922b46
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -55,10 +55,3 @@ bazarr:
           main:
             - path: /mnt/store
               readOnly: false
-volsync-target-config:
-  pvcTarget: bazarr-config
-  moverSecurityContext:
-    runAsUser: 1000
-    runAsGroup: 1000
-    fsGroup: 1000
-    fsGroupChangePolicy: OnRootMismatch

clusters/cl01tl/applications/calibre-web-automated/Chart.yaml

@@ -0,0 +1,21 @@
+apiVersion: v2
+name: calibre-web-automated
+version: 1.0.0
+description: Calibre Web Automated
+keywords:
+  - calibre-web-automated
+  - books
+home: https://wiki.alexlebens.dev/s/fdcfdb7e-8f73-438e-b59c-3c2de2081885
+sources:
+  - https://github.com/crocodilestick/Calibre-Web-Automator
+  - https://hub.docker.com/r/crocodilestick/calibre-web-automated
+  - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+maintainers:
+  - name: alexlebens
+dependencies:
+  - name: app-template
+    alias: calibre-web-automated
+    repository: https://bjw-s-labs.github.io/helm-charts/
+    version: 4.1.2
+icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/calibre-web.png
+appVersion: V3.0.4

clusters/cl01tl/applications/calibre-web-automated/templates/external-secret.yaml

@@ -0,0 +1,78 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: calibre-web-automated-gmail-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: calibre-web-automated-gmail-config
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: gmail.json
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/calibre-web/gmail
+        metadataPolicy: None
+        property: gmail.json
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: calibre-web-automated-config-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: calibre-web-automated-config-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/calibre-web-automated/calibre-web-automated-config"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key

clusters/cl01tl/applications/calibre-web-automated/templates/http-route.yaml

@@ -1,10 +1,10 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-garage-webui
+  name: http-route-calibre
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-garage-webui
+    app.kubernetes.io/name: http-route-calibre
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -14,7 +14,7 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - garage-webui.alexlebens.net
+    - calibre.alexlebens.net
   rules:
     - matches:
       - path:
@@ -23,18 +23,18 @@ spec:
       backendRefs:
         - group: ''
           kind: Service
-          name: garage-webui
+          name: calibre-web-automated-main
-          port: 3909
+          port: 8083
           weight: 100
 
 ---
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-garage-s3
+  name: http-route-calibre-downloader
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-garage-s3
+    app.kubernetes.io/name: http-route-calibre-downloader
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -44,7 +44,7 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - garage-s3.alexlebens.net
+    - calibre-downloader.alexlebens.net
   rules:
     - matches:
       - path:
@@ -53,6 +53,6 @@ spec:
       backendRefs:
         - group: ''
           kind: Service
-          name: garage-main
+          name: calibre-web-automated-downloader
-          port: 3900
+          port: 8084
           weight: 100

clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume-claim.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: booklore-books-nfs-storage
+  name: calibre-web-automated-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: booklore-books-nfs-storage
+    app.kubernetes.io/name: calibre-web-automated-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  volumeName: booklore-books-nfs-storage
+  volumeName: calibre-web-automated-nfs-storage
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -20,14 +20,14 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: booklore-books-import-nfs-storage
+  name: calibre-web-automated-ingest-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: booklore-books-import-nfs-storage
+    app.kubernetes.io/name: calibre-web-automated-ingest-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  volumeName: booklore-books-import-nfs-storage
+  volumeName: calibre-web-automated-ingest-nfs-storage
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany

clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: backrest-nfs-storage
+  name: calibre-web-automated-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: backrest-nfs-storage
+    app.kubernetes.io/name: calibre-web-automated-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -15,7 +15,7 @@ spec:
   accessModes:
     - ReadWriteMany
   nfs:
-    path: /volume2/Storage
+    path: /volume2/Storage/Calibre
     server: synologybond.alexlebens.net
   mountOptions:
     - vers=4
@@ -26,10 +26,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: backrest-nfs-share
+  name: calibre-web-automated-ingest-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: backrest-nfs-share
+    app.kubernetes.io/name: calibre-web-automated-ingest-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -40,7 +40,7 @@ spec:
   accessModes:
     - ReadWriteMany
   nfs:
-    path: /volume2/Share
+    path: /volume2/Storage/Calibre Import
     server: synologybond.alexlebens.net
   mountOptions:
     - vers=4

clusters/cl01tl/applications/calibre-web-automated/templates/replication-source.yaml

@@ -0,0 +1,28 @@
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+  name: calibre-web-automated-config-backup-source
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: calibre-web-automated-config-backup-source
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  sourcePVC: calibre-web-automated-config
+  trigger:
+    schedule: 0 4 * * *
+  restic:
+    pruneIntervalDays: 7
+    repository: calibre-web-automated-config-backup-secret
+    retain:
+      hourly: 1
+      daily: 3
+      weekly: 2
+      monthly: 2
+      yearly: 4
+    moverSecurityContext:
+      runAsUser: 1000
+      runAsGroup: 100
+    copyMethod: Snapshot
+    storageClassName: ceph-block
+    volumeSnapshotClassName: ceph-blockpool-snapshot

clusters/cl01tl/applications/calibre-web-automated/values.yaml

@@ -0,0 +1,119 @@
+calibre-web-automated:
+  controllers:
+    main:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      revisionHistoryLimit: 3
+      containers:
+        main:
+          image:
+            repository: crocodilestick/calibre-web-automated
+            tag: V3.0.4
+            pullPolicy: IfNotPresent
+          env:
+            - name: TZ
+              value: US/Central
+            - name: PUID
+              value: 1000
+            - name: PGID
+              value: 100
+          resources:
+            requests:
+              cpu: 10m
+              memory: 256Mi
+    downloader:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      revisionHistoryLimit: 3
+      containers:
+        main:
+          image:
+            repository: ghcr.io/calibrain/calibre-web-automated-book-downloader
+            tag: latest@sha256:914a9e80b1c5b81b0e17a7d82ad1d1e22b0050164a739131203831123c60baf7
+            pullPolicy: IfNotPresent
+          env:
+            - name: FLASK_PORT
+              value: 8084
+            - name: UID
+              value: 1000
+            - name: GID
+              value: 100
+            - name: USE_CF_BYPASS
+              value: true
+            - name: CLOUDFLARE_PROXY_URL
+              value: http://localhost:8000
+            - name: INGEST_DIR
+              value: /cwa-book-ingest
+            - name: BOOK_LANGUAGE
+              value: end
+          resources:
+            requests:
+              cpu: 10m
+              memory: 256Mi
+        bypass:
+          image:
+            repository: ghcr.io/sarperavci/cloudflarebypassforscraping
+            tag: latest@sha256:bd326a3c6ae0b7ed3e405bbaa230e43e252f444c98f57d179f7a1d78f273748b
+            pullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 8083
+          targetPort: 8083
+          protocol: HTTP
+    downloader:
+      controller: downloader
+      ports:
+        http:
+          port: 8084
+          targetPort: 8084
+          protocol: HTTP
+  persistence:
+    config:
+      forceRename: calibre-web-automated-config
+      storageClass: ceph-block
+      accessMode: ReadWriteOnce
+      size: 5Gi
+      retain: true
+      advancedMounts:
+        main:
+          main:
+            - path: /config
+              readOnly: false
+    gmail:
+      enabled: true
+      type: secret
+      name: calibre-web-automated-gmail-config
+      advancedMounts:
+        main:
+          main:
+            - path: /app/calibre-web/gmail.json
+              readOnly: true
+              mountPropagation: None
+              subPath: gmail.json
+    books:
+      existingClaim: calibre-web-automated-nfs-storage
+      advancedMounts:
+        main:
+          main:
+            - path: /calibre-library
+              readOnly: false
+    ingest:
+      existingClaim: calibre-web-automated-ingest-nfs-storage
+      advancedMounts:
+        main:
+          main:
+            - path: /cwa-book-ingest
+              readOnly: false
+        downloader:
+          main:
+            - path: /cwa-book-ingest
+              readOnly: false

clusters/cl01tl/applications/code-server/Chart.yaml

@@ -19,14 +19,10 @@ dependencies:
   - name: app-template
     alias: code-server
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.18.0
-  - name: volsync-target
-    alias: volsync-target-config
-    version: 0.5.0
-    repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/visual-studio-code.png
-appVersion: 4.106.3
+appVersion: 4.100.2

clusters/cl01tl/applications/code-server/templates/persistent-volume-claim.yaml

@@ -1,17 +1,17 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: gitea-themes-storage
+  name: code-server-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: gitea-themes-storage
+    app.kubernetes.io/name: code-server-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   volumeMode: Filesystem
-  storageClassName: ceph-filesystem
+  storageClassName: nfs-client
   accessModes:
-    - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 1Gi

clusters/cl01tl/applications/code-server/values.yaml

@@ -9,7 +9,7 @@ code-server:
         main:
           image:
             repository: ghcr.io/linuxserver/code-server
-            tag: 4.106.3@sha256:83793e4460090d6c46f4842ff6ab8aa26ad8a567885112bbe754b45c61935055
+            tag: 4.101.2@sha256:e95165de246ed30656081fc9a517b6ceccc00a2232b8455a996faab42c252f5e
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -37,11 +37,7 @@ code-server:
           protocol: HTTP
   persistence:
     config:
-      forceRename: code-server-config
+      existingClaim: code-server-nfs-storage
-      storageClass: ceph-block
-      accessMode: ReadWriteOnce
-      size: 2Gi
-      retain: true
       advancedMounts:
         main:
           main:
@@ -49,10 +45,3 @@ code-server:
               readOnly: false
 cloudflared:
   existingSecretName: code-server-cloudflared-secret
-volsync-target-config:
-  pvcTarget: code-server-config
-  moverSecurityContext:
-    runAsUser: 1000
-    runAsGroup: 1000
-    fsGroup: 1000
-    fsGroupChangePolicy: OnRootMismatch

clusters/cl01tl/applications/directus/Chart.yaml

@@ -8,10 +8,12 @@ keywords:
 home: https://wiki.alexlebens.dev/s/c2d242de-dcaa-4801-86a2-c4761dc8bf9b
 sources:
   - https://github.com/directus/directus
+  - https://github.com/valkey-io/valkey
   - https://github.com/cloudflare/cloudflared
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://hub.docker.com/r/directus/directus
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/cloudflared
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
@@ -20,17 +22,17 @@ dependencies:
   - name: app-template
     alias: directus
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
+  - name: valkey
+    version: 3.0.20
+    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: cloudflared
     alias: cloudflared-directus
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.18.0
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 7.1.1
+    version: 5.1.0
-    repository: oci://harbor.alexlebens.net/helm-charts
-  - name: redis-replication
-    version: 0.5.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/directus.png
-appVersion: 11.14.0
+appVersion: 11.7.2

clusters/cl01tl/applications/directus/templates/external-secret.yaml

@@ -68,10 +68,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: directus-redis-config
+  name: directus-valkey-config
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: directus-redis-config
+    app.kubernetes.io/name: directus-valkey-config
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -83,14 +83,14 @@ spec:
       remoteRef:
         conversionStrategy: Default
         decodingStrategy: None
-        key: /cl01tl/directus/redis
+        key: /cl01tl/directus/valkey
         metadataPolicy: None
         property: user
     - secretKey: password
       remoteRef:
         conversionStrategy: Default
         decodingStrategy: None
-        key: /cl01tl/directus/redis
+        key: /cl01tl/directus/valkey
         metadataPolicy: None
         property: password
 
@@ -151,10 +151,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: directus-postgresql-18-cluster-backup-secret
+  name: directus-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: directus-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: directus-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -176,40 +176,3 @@ spec:
         key: /digital-ocean/home-infra/postgres-backups
         metadataPolicy: None
         property: secret
-
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: directus-postgresql-18-cluster-backup-secret-garage
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: directus-postgresql-18-cluster-backup-secret-garage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: ACCESS_KEY_ID
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_KEY_ID
-    - secretKey: ACCESS_SECRET_KEY
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_SECRET_KEY
-    - secretKey: ACCESS_REGION
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_REGION

clusters/cl01tl/applications/directus/values.yaml

@@ -9,7 +9,7 @@ directus:
         main:
           image:
             repository: directus/directus
-            tag: 11.14.0
+            tag: 11.9.3
             pullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -41,47 +41,43 @@ directus:
             - name: DB_HOST
               valueFrom:
                 secretKeyRef:
-                  name: directus-postgresql-18-cluster-app
+                  name: directus-postgresql-17-cluster-app
                   key: host
             - name: DB_DATABASE
               valueFrom:
                 secretKeyRef:
-                  name: directus-postgresql-18-cluster-app
+                  name: directus-postgresql-17-cluster-app
                   key: dbname
             - name: DB_PORT
               valueFrom:
                 secretKeyRef:
-                  name: directus-postgresql-18-cluster-app
+                  name: directus-postgresql-17-cluster-app
                   key: port
             - name: DB_USER
               valueFrom:
                 secretKeyRef:
-                  name: directus-postgresql-18-cluster-app
+                  name: directus-postgresql-17-cluster-app
                   key: user
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: directus-postgresql-18-cluster-app
+                  name: directus-postgresql-17-cluster-app
                   key: password
-            - name: SYNCHRONIZATION_STORE
-              value: redis
-            - name: CACHE_ENABLED
-              value: true
-            - name: CACHE_STORE
-              value: redis
             - name: REDIS_ENABLED
               value: true
             - name: REDIS_HOST
-              value: redis-replication-directus-master
+              value: directus-valkey-primary
+            - name: REDIS_PORT
+              value: 6379
             - name: REDIS_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: directus-redis-config
+                  name: directus-valkey-config
                   key: user
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: directus-redis-config
+                  name: directus-valkey-config
                   key: password
             - name: STORAGE_LOCATIONS
               value: s3
@@ -153,70 +149,55 @@ directus:
           port: 80
           targetPort: 8055
           protocol: TCP
+valkey:
+  architecture: replication
+  auth:
+    enabled: true
+    existingSecret: directus-valkey-config
+    existingSecretPasswordKey: password
+    usePasswordFiles: false
+  primary:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 64Mi
+    persistence:
+      enabled: true
+      size: 1Gi
+  replica:
+    replicaCount: 1
+    resources:
+      requests:
+        cpu: 100m
+        memory: 64Mi
+    persistence:
+      enabled: true
+      size: 1Gi
 cloudflared-directus:
   name: cloudflared-directus
   existingSecretName: directus-cloudflared-secret
-postgres-18-cluster:
+postgres-17-cluster:
-  mode: recovery
+  mode: standalone
   cluster:
     storage:
       storageClass: local-path
     walStorage:
       storageClass: local-path
+    monitoring:
+      enabled: true
+      prometheusRule:
+        enabled: true
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-18-cluster
+      endpointURL: https://nyc3.digitaloceanspaces.com
-      endpointURL: http://garage-main.garage:3900
+      destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/directus/directus-postgresql-17-cluster
-      index: 1
+      endpointCredentials: directus-postgresql-17-cluster-backup-secret
-      endpointCredentials: directus-postgresql-18-cluster-backup-secret-garage
+      recoveryIndex: 2
   backup:
-    objectStore:
-      - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-18-cluster
-        index: 1
-        endpointURL: http://garage-main.garage:3900
-        endpointCredentials: directus-postgresql-18-cluster-backup-secret-garage
-        endpointCredentialsIncludeRegion: true
-        retentionPolicy: "3d"
-        isWALArchiver: true
-      # - name: external
-      #   destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/directus/directus-postgresql-18-cluster
-      #   index: 1
-      #   retentionPolicy: "30d"
-      #   isWALArchiver: false
-      # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-18-cluster
-      #   index: 1
-      #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: directus-postgresql-18-cluster-backup-secret-garage
-      #   retentionPolicy: "30d"
-      #   data:
-      #     compression: bzip2
-      #     jobs: 2
-    scheduledBackups:
-      - name: live-backup
-        suspend: false
-        immediate: true
-        schedule: "0 0 0 * * *"
-        backupName: garage-local
-      # - name: daily-backup
-      #   suspend: false
-      #   immediate: true
-      #   schedule: "0 0 0 * * *"
-      #   backupName: external
-      # - name: weekly-backup
-      #   suspend: false
-      #   immediate: true
-      #   schedule: "0 0 4 * * SAT"
-      #   backupName: garage-remote
-redis-replication:
-  existingSecret:
     enabled: true
-    name: directus-redis-config
+    endpointURL: https://nyc3.digitaloceanspaces.com
-    key: password
+    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/directus/directus-postgresql-17-cluster
-  redisReplication:
+    endpointCredentials: directus-postgresql-17-cluster-backup-secret
-    clusterSize: 3
+    backupIndex: 2
-  redisSentinel:
+    retentionPolicy: "7d"
-    enabled: true
-    clusterSize: 3

clusters/cl01tl/applications/eigenfocus/Chart.yaml

@@ -0,0 +1,21 @@
+apiVersion: v2
+name: eigenfocus
+version: 1.0.0
+description: Eigenfocus
+keywords:
+  - eigenfocus
+  - projects
+home: https://wiki.alexlebens.dev/s/82548c75-cefe-4ad2-b60c-0b101127c31b
+sources:
+  - https://github.com/Eigenfocus/eigenfocus
+  - https://hub.docker.com/r/eigenfocus/eigenfocus
+  - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+maintainers:
+  - name: alexlebens
+dependencies:
+  - name: app-template
+    alias: eigenfocus
+    repository: https://bjw-s-labs.github.io/helm-charts/
+    version: 4.1.2
+icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/eigenfocus.png
+appVersion: 1.1.0

clusters/cl01tl/applications/eigenfocus/templates/external-secret.yaml

@@ -0,0 +1,55 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: eigenfocus-data-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: eigenfocus-data-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/eigenfocus/eigenfocus-data"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key

clusters/cl01tl/applications/eigenfocus/templates/http-route.yaml

@@ -0,0 +1,28 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: http-route-eigenfocus
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: http-route-eigenfocus
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: traefik-gateway
+      namespace: traefik
+  hostnames:
+    - eigenfocus.alexlebens.net
+  rules:
+    - matches:
+      - path:
+          type: PathPrefix
+          value: /
+      backendRefs:
+        - group: ''
+          kind: Service
+          name: eigenfocus
+          port: 80
+          weight: 100

clusters/cl01tl/applications/eigenfocus/templates/replication-source.yaml

@@ -1,19 +1,19 @@
 apiVersion: volsync.backube/v1alpha1
 kind: ReplicationSource
 metadata:
-  name: seerr-config-backup-source
+  name: eigenfocus-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: seerr-config-backup-source
+    app.kubernetes.io/name: eigenfocus-data-backup-source
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  sourcePVC: seerr-seerr-chart-config
+  sourcePVC: eigenfocus-data
   trigger:
     schedule: 0 4 * * *
   restic:
     pruneIntervalDays: 7
-    repository: seerr-config-backup-secret
+    repository: eigenfocus-data-backup-secret
     retain:
       hourly: 1
       daily: 3
@@ -23,4 +23,3 @@ spec:
     copyMethod: Snapshot
     storageClassName: ceph-block
     volumeSnapshotClassName: ceph-blockpool-snapshot
-    cacheCapacity: 10Gi

clusters/cl01tl/applications/eigenfocus/values.yaml

@@ -1,4 +1,4 @@
-listenarr:
+eigenfocus:
   controllers:
     main:
       type: deployment
@@ -8,15 +8,15 @@ listenarr:
       containers:
         main:
           image:
-            repository: therobbiedavis/listenarr
+            repository: eigenfocus/eigenfocus
-            tag: canary-0.2.35
+            tag: 1.2.0-free
             pullPolicy: IfNotPresent
           env:
-            - name: LISTENARR_PUBLIC_URL
+            - name: DEFAULT_HOST_URL
-              value: https://listenarr.alexlebens.net
+              value: https://eigenfocus.alexlebens.net
           resources:
             requests:
-              cpu: 50m
+              cpu: 10m
               memory: 128Mi
   service:
     main:
@@ -24,23 +24,17 @@ listenarr:
       ports:
         http:
           port: 80
-          targetPort: 5000
+          targetPort: 3000
           protocol: HTTP
   persistence:
-    config:
+    data:
+      forceRename: eigenfocus-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
-      size: 5Gi
+      size: 2Gi
       retain: true
       advancedMounts:
         main:
           main:
-            - path: /app/config
+            - path: /eigenfocus-app/app-data
-              readOnly: false
-    media:
-      existingClaim: listenarr-nfs-storage
-      advancedMounts:
-        main:
-          main:
-            - path: /data
               readOnly: false

clusters/cl01tl/applications/element-web/Chart.yaml

@@ -17,11 +17,11 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: element-web
-    version: 1.4.26
+    version: 1.4.15
     repository: https://ananace.gitlab.io/charts
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.18.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/element.png
-appVersion: v1.12.6
+appVersion: v1.11.100

clusters/cl01tl/applications/element-web/values.yaml

@@ -2,7 +2,7 @@ element-web:
   replicaCount: 1
   image:
     repository: vectorim/element-web
-    tag: v1.12.6
+    tag: v1.11.105
     pullPolicy: IfNotPresent
   defaultServer:
     url: https://matrix.alexlebens.dev
@@ -12,8 +12,8 @@ element-web:
     disable_3pid_login: true
     brand: "Alex Lebens"
     branding:
-      welcome_background_url: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/background.jpg
+      welcome_background_url: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/background-4.jpg
-      auth_header_logo_url: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.png
+      auth_header_logo_url: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
     sso_redirect_options:
       immediate: true
     default_theme: dark

clusters/cl01tl/applications/freshrss/Chart.yaml

@@ -20,18 +20,14 @@ dependencies:
   - name: app-template
     alias: freshrss
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.18.0
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 7.1.1
+    version: 5.1.0
-    repository: oci://harbor.alexlebens.net/helm-charts
-  - name: volsync-target
-    alias: volsync-target-data
-    version: 0.5.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/freshrss.png
-appVersion: 1.27.1
+appVersion: 1.26.2

clusters/cl01tl/applications/freshrss/templates/external-secret.yaml

@@ -98,10 +98,67 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: freshrss-postgresql-18-cluster-backup-secret
+  name: freshrss-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: freshrss-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: freshrss-data-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/freshrss/freshrss-data"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: freshrss-postgresql-17-cluster-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: freshrss-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -123,40 +180,3 @@ spec:
         key: /digital-ocean/home-infra/postgres-backups
         metadataPolicy: None
         property: secret
-
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: freshrss-postgresql-18-cluster-backup-secret-garage
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: freshrss-postgresql-18-cluster-backup-secret-garage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: ACCESS_KEY_ID
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_KEY_ID
-    - secretKey: ACCESS_SECRET_KEY
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_SECRET_KEY
-    - secretKey: ACCESS_REGION
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_REGION

clusters/cl01tl/applications/freshrss/templates/replication-source.yaml

@@ -0,0 +1,35 @@
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+  name: freshrss-data-backup-source
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: freshrss-data-backup-source
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  sourcePVC: freshrss-data
+  trigger:
+    schedule: 0 4 * * *
+  restic:
+    pruneIntervalDays: 7
+    repository: freshrss-data-backup-secret
+    retain:
+      hourly: 1
+      daily: 3
+      weekly: 2
+      monthly: 2
+      yearly: 4
+    moverSecurityContext:
+      runAsUser: 568
+      runAsGroup: 568
+      fsGroup: 568
+      fsGroupChangePolicy: OnRootMismatch
+      supplementalGroups:
+        - 44
+        - 100
+        - 109
+        - 65539
+    copyMethod: Snapshot
+    storageClassName: ceph-block
+    volumeSnapshotClassName: ceph-blockpool-snapshot

clusters/cl01tl/applications/freshrss/values.yaml

@@ -11,7 +11,7 @@ freshrss:
             runAsUser: 0
           image:
             repository: alpine
-            tag: 3.23.0
+            tag: 3.22.0
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -35,7 +35,7 @@ freshrss:
             runAsUser: 0
           image:
             repository: alpine
-            tag: 3.23.0
+            tag: 3.22.0
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -49,29 +49,7 @@ freshrss:
               git checkout;
               rm -rf /var/www/FreshRSS/extensions/xExtension-ImageProxy
               cp -r xExtension-ImageProxy /var/www/FreshRSS/extensions
-              chown -R 568:568 /var/www/FreshRSS/extensions/xExtension-ImageProxy
+              chown -R 568:568 /var/www/FreshRSS/extensions/xExtension-YouTubeChannel2RssFeed
-          resources:
-            requests:
-              cpu: 10m
-              memory: 128Mi
-        init-download-extension-3:
-          securityContext:
-            runAsUser: 0
-          image:
-            repository: alpine
-            tag: 3.23.0
-            pullPolicy: IfNotPresent
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              cd /tmp;
-              wget https://github.com/zimmra/xExtension-karakeep-button/archive/refs/tags/v1.1.tar.gz;
-              tar -xvzf *.tar.gz;
-              rm -rf /var/www/FreshRSS/extensions/xExtension-karakeep-button
-              mkdir /var/www/FreshRSS/extensions/xExtension-karakeep-button
-              cp -r /tmp/xExtension-karakeep-button-*/* /var/www/FreshRSS/extensions/xExtension-karakeep-button
-              chown -R 568:568 /var/www/FreshRSS/extensions/xExtension-karakeep-button
           resources:
             requests:
               cpu: 10m
@@ -80,7 +58,7 @@ freshrss:
         main:
           image:
             repository: freshrss/freshrss
-            tag: 1.27.1
+            tag: 1.26.3
             pullPolicy: IfNotPresent
           env:
             - name: PGID
@@ -98,22 +76,22 @@ freshrss:
             - name: DB_HOST
               valueFrom:
                 secretKeyRef:
-                  name: freshrss-postgresql-18-cluster-app
+                  name: freshrss-postgresql-17-cluster-app
                   key: host
             - name: DB_BASE
               valueFrom:
                 secretKeyRef:
-                  name: freshrss-postgresql-18-cluster-app
+                  name: freshrss-postgresql-17-cluster-app
                   key: dbname
             - name: DB_USER
               valueFrom:
                 secretKeyRef:
-                  name: freshrss-postgresql-18-cluster-app
+                  name: freshrss-postgresql-17-cluster-app
                   key: user
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: freshrss-postgresql-18-cluster-app
+                  name: freshrss-postgresql-17-cluster-app
                   key: password
             - name: FRESHRSS_INSTALL
               value: |
@@ -163,7 +141,6 @@ freshrss:
           protocol: HTTP
   persistence:
     data:
-      forceRename: freshrss-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 5Gi
@@ -186,77 +163,33 @@ freshrss:
           init-download-extension-2:
             - path: /var/www/FreshRSS/extensions
               readOnly: false
-          init-download-extension-3:
-            - path: /var/www/FreshRSS/extensions
-              readOnly: false
           main:
             - path: /var/www/FreshRSS/extensions
               readOnly: false
 cloudflared:
   existingSecretName: freshrss-cloudflared-secret
-postgres-18-cluster:
+postgres-17-cluster:
-  mode: recovery
+  mode: standalone
   cluster:
     storage:
       storageClass: local-path
     walStorage:
       storageClass: local-path
+    monitoring:
+      enabled: true
+      prometheusRule:
+        enabled: true
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
+      endpointURL: https://nyc3.digitaloceanspaces.com
-      endpointURL: http://garage-main.garage:3900
+      destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-17-cluster
-      index: 1
+      endpointCredentials: freshrss-postgresql-17-cluster-backup-secret
-      endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage
+      recoveryIndex: 3
   backup:
-    objectStore:
+    enabled: true
-      - name: garage-local
+    endpointURL: https://nyc3.digitaloceanspaces.com
-        destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
+    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-17-cluster
-        index: 1
+    endpointCredentials: freshrss-postgresql-17-cluster-backup-secret
-        endpointURL: http://garage-main.garage:3900
+    backupIndex: 3
-        endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage
+    retentionPolicy: "7d"
-        endpointCredentialsIncludeRegion: true
-        retentionPolicy: "3d"
-        isWALArchiver: true
-      # - name: external
-      #   destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-18-cluster
-      #   index: 1
-      #   retentionPolicy: "30d"
-      #   isWALArchiver: false
-      # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
-      #   index: 1
-      #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage
-      #   retentionPolicy: "30d"
-      #   data:
-      #     compression: bzip2
-      #     jobs: 2
-    scheduledBackups:
-      - name: live-backup
-        suspend: false
-        immediate: true
-        schedule: "0 0 0 * * *"
-        backupName: garage-local
-      # - name: daily-backup
-      #   suspend: false
-      #   immediate: true
-      #   schedule: "0 0 0 * * *"
-      #   backupName: external
-      # - name: weekly-backup
-      #   suspend: true
-      #   immediate: true
-      #   schedule: "0 0 4 * * SAT"
-      #   backupName: garage-remote
-volsync-target-data:
-  pvcTarget: freshrss-data
-  moverSecurityContext:
-    runAsUser: 568
-    runAsGroup: 568
-    fsGroup: 568
-    fsGroupChangePolicy: OnRootMismatch
-    supplementalGroups:
-      - 44
-      - 100
-      - 109
-      - 65539

clusters/cl01tl/applications/hoarder/Chart.yaml

@@ -1,8 +1,9 @@
 apiVersion: v2
-name: karakeep
+name: hoarder
 version: 1.0.0
 description: Karakeep
 keywords:
+  - hoarder
   - karakeep
   - bookmarks
 home: https://wiki.alexlebens.dev/s/f8177591-8253-4e21-82d5-a556f0aeafad
@@ -18,15 +19,15 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: app-template
-    alias: karakeep
+    alias: hoarder
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
   - name: meilisearch
-    version: 0.18.0
+    version: 0.14.0
     repository: https://meilisearch.github.io/meilisearch-kubernetes
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.18.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/webp/karakeep.webp
-appVersion: 0.29.1
+appVersion: 0.24.1

clusters/cl01tl/applications/hoarder/templates/external-secret.yaml

@@ -19,13 +19,6 @@ spec:
         key: /cl01tl/karakeep/key
         metadataPolicy: None
         property: key
-    - secretKey: prometheus-token
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /cl01tl/karakeep/key
-        metadataPolicy: None
-        property: prometheus-token
 
 ---
 apiVersion: external-secrets.io/v1
@@ -107,10 +100,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: karakeep-data-backup-secret
+  name: hoarder-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: karakeep-data-backup-secret
+    app.kubernetes.io/name: hoarder-data-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -122,7 +115,7 @@ spec:
       mergePolicy: Merge
       engineVersion: v2
       data:
-        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/karakeep/karakeep-data"
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/hoarder/hoarder-data"
   data:
     - secretKey: BUCKET_ENDPOINT
       remoteRef:

clusters/cl01tl/applications/hoarder/templates/replication-source.yaml

@@ -0,0 +1,25 @@
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+  name: hoarder-data-backup-source
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: hoarder-data-backup-source
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  sourcePVC: hoarder-data
+  trigger:
+    schedule: 0 4 * * *
+  restic:
+    pruneIntervalDays: 7
+    repository: hoarder-data-backup-secret
+    retain:
+      hourly: 1
+      daily: 3
+      weekly: 2
+      monthly: 2
+      yearly: 4
+    copyMethod: Snapshot
+    storageClassName: ceph-block
+    volumeSnapshotClassName: ceph-blockpool-snapshot

clusters/cl01tl/applications/hoarder/values.yaml

@@ -1,4 +1,4 @@
-karakeep:
+hoarder:
   controllers:
     main:
       type: deployment
@@ -9,13 +9,11 @@ karakeep:
         main:
           image:
             repository: ghcr.io/karakeep-app/karakeep
-            tag: 0.29.1
+            tag: 0.25.0
             pullPolicy: IfNotPresent
           env:
             - name: DATA_DIR
               value: /data
-            - name: DB_WAL_MODE
-              value: true
             - name: NEXTAUTH_URL
               value: https://karakeep.alexlebens.dev/
             - name: NEXTAUTH_SECRET
@@ -23,41 +21,15 @@ karakeep:
                 secretKeyRef:
                   name: karakeep-key-secret
                   key: key
-            - name: PROMETHEUS_AUTH_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: karakeep-key-secret
-                  key: prometheus-token
-            - name: ASSET_STORE_S3_ENDPOINT
-              value: http://rook-ceph-rgw-ceph-objectstore.rook-ceph.svc:80
-            - name: ASSET_STORE_S3_REGION
-              value: us-east-1
-            - name: ASSET_STORE_S3_BUCKET
-              valueFrom:
-                configMapKeyRef:
-                  name: ceph-bucket-karakeep
-                  key: BUCKET_NAME
-            - name: ASSET_STORE_S3_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: ceph-bucket-karakeep
-                  key: AWS_ACCESS_KEY_ID
-            - name: ASSET_STORE_S3_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: ceph-bucket-karakeep
-                  key: AWS_SECRET_ACCESS_KEY
-            - name: ASSET_STORE_S3_FORCE_PATH_STYLE
-              value: true
             - name: MEILI_ADDR
-              value: http://karakeep-meilisearch.karakeep:7700
+              value: http://hoarder-meilisearch.hoarder:7700
             - name: MEILI_MASTER_KEY
               valueFrom:
                 secretKeyRef:
                   name: karakeep-meilisearch-master-key-secret
                   key: MEILI_MASTER_KEY
             - name: BROWSER_WEB_URL
-              value: http://karakeep.karakeep:9222
+              value: http://hoarder.hoarder:9222
             - name: DISABLE_SIGNUPS
               value: false
             - name: OAUTH_PROVIDER_NAME
@@ -77,13 +49,13 @@ karakeep:
                   name: karakeep-oidc-secret
                   key: AUTHENTIK_CLIENT_SECRET
             - name: OLLAMA_BASE_URL
-              value: http://ollama-server-3.ollama:11434
+              value: http://ollama-server-1.ollama:11434
             - name: OLLAMA_KEEP_ALIVE
               value: 5m
             - name: INFERENCE_TEXT_MODEL
-              value: gemma3:4b
+              value: llama3.1:8b
             - name: INFERENCE_IMAGE_MODEL
-              value: granite3.2-vision:2b
+              value: llama3.2-vision:11b
             - name: EMBEDDING_TEXT_MODEL
               value: mxbai-embed-large
             - name: INFERENCE_JOB_TIMEOUT_SEC
@@ -122,6 +94,7 @@ karakeep:
           protocol: HTTP
   persistence:
     data:
+      forceRename: hoarder-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 10Gi

clusters/cl01tl/applications/home-assistant/Chart.yaml

@@ -18,6 +18,6 @@ dependencies:
   - name: app-template
     alias: home-assistant
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/home-assistant.png
-appVersion: 2025.12.2
+appVersion: 2025.5.2

clusters/cl01tl/applications/home-assistant/values.yaml

@@ -9,7 +9,7 @@ home-assistant:
         main:
           image:
             repository: ghcr.io/home-assistant/home-assistant
-            tag: 2025.12.2
+            tag: 2025.7.1
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -21,7 +21,7 @@ home-assistant:
         code-server:
           image:
             repository: ghcr.io/linuxserver/code-server
-            tag: 4.106.3@sha256:83793e4460090d6c46f4842ff6ab8aa26ad8a567885112bbe754b45c61935055
+            tag: 4.101.2@sha256:e95165de246ed30656081fc9a517b6ceccc00a2232b8455a996faab42c252f5e
             pullPolicy: IfNotPresent
           env:
             - name: TZ

clusters/cl01tl/applications/homepage-dev/Chart.yaml

@@ -18,10 +18,10 @@ dependencies:
   - name: app-template
     alias: homepage
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.18.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/homepage.png
-appVersion: v1.8.0
+appVersion: v1.2.0

clusters/cl01tl/applications/homepage-dev/values.yaml

@@ -11,7 +11,7 @@ homepage:
         main:
           image:
             repository: ghcr.io/gethomepage/homepage
-            tag: v1.8.0
+            tag: v1.3.2
             pullPolicy: IfNotPresent
           env:
             - name: HOMEPAGE_ALLOWED_HOSTS
@@ -27,18 +27,18 @@ homepage:
         docker.yaml: ""
         kubernetes.yaml: ""
         settings.yaml: |
-          favicon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.svg
+          favicon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
           headerStyle: clean
           hideVersion: true
           color: zinc
           background:
-            image: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/background.jpg
+            image: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/background-4.jpg
             brightness: 50
           theme: dark
           disableCollapse: true
         widgets.yaml: |
           - logo:
-              icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.png
+              icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
           - datetime:
               text_size: xl
               format:
@@ -75,7 +75,7 @@ homepage:
                   siteMonitor: https://codeserver.alexlebens.dev
                   statusStyle: dot
               - Site:
-                  icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.png
+                  icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
                   description: Profile Website
                   href: https://www.alexlebens.dev
                   siteMonitor: https://www.alexlebens.dev

clusters/cl01tl/applications/homepage/Chart.yaml

@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: homepage
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/homepage.png
-appVersion: v1.8.0
+appVersion: v1.2.0

clusters/cl01tl/applications/homepage/templates/service.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: node-ps10rp
+  name: gitea-ps10rp
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: node-ps10rp
+    app.kubernetes.io/name: gitea-ps10rp
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
   annotations:
-    tailscale.com/tailnet-fqdn: node-exporter-ps10rp.boreal-beaufort.ts.net
+    tailscale.com/tailnet-fqdn: gitea-ps10rp.boreal-beaufort.ts.net
 spec:
   externalName: placeholder
   type: ExternalName
@@ -17,14 +17,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: garage-ps10rp
+  name: home-ps10rp
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: garage-ps10rp
+    app.kubernetes.io/name: home-ps10rp
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
   annotations:
-    tailscale.com/tailnet-fqdn: garage-ps10rp.boreal-beaufort.ts.net
+    tailscale.com/tailnet-fqdn: home-ps10rp.boreal-beaufort.ts.net
 spec:
   externalName: placeholder
   type: ExternalName

clusters/cl01tl/applications/homepage/values.yaml

@@ -15,7 +15,7 @@ homepage:
         main:
           image:
             repository: ghcr.io/gethomepage/homepage
-            tag: v1.8.0
+            tag: v1.3.2
             pullPolicy: IfNotPresent
           env:
             - name: HOMEPAGE_ALLOWED_HOSTS
@@ -39,12 +39,12 @@ homepage:
         kubernetes.yaml: |
           mode: cluster
         settings.yaml: |
-          favicon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.svg
+          favicon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
           headerStyle: clean
           hideVersion: true
           color: zinc
           background:
-            image: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/background.jpg
+            image: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/background-4.jpg
             brightness: 50
           theme: dark
           disableCollapse: true
@@ -76,21 +76,18 @@ homepage:
             - Storage:
                 tab: Services
                 icon: mdi-database-#ffffff
-            - Content:
-                tab: Services
-                icon: mdi-multimedia-#ffffff
             - TV Shows:
-                tab: Content
+                tab: Servarr
                 icon: mdi-television-#ffffff
             - Movies:
-                tab: Content
+                tab: Servarr
                 icon: mdi-filmstrip-#ffffff
             - Music:
-                tab: Content
+                tab: Servarr
                 icon: mdi-music-box-multiple-#ffffff
-            - Books:
+            - Services (Servarr):
-                tab: Content
+                tab: Servarr
-                icon: mdi-book-open-variant-#ffffff
+                icon: mdi-radar-#ffffff
             - External Services:
                 tab: Bookmarks
                 icon: mdi-cloud-#ffffff
@@ -102,7 +99,7 @@ homepage:
                 icon: mdi-cloud-#ffffff
         widgets.yaml: |
           - logo:
-              icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.png
+              icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
           - kubernetes:
               cluster:
                 show: true
@@ -135,33 +132,21 @@ homepage:
                   href: https://plex.alexlebens.net
                   siteMonitor: http://plex.plex:32400
                   statusStyle: dot
+              - Media Requests:
+                  icon: sh-overseerr.webp
+                  description: Overseer
+                  href: https://overseerr.alexlebens.net
+                  siteMonitor: http://overseerr.overseerr:80
+                  statusStyle: dot
               - Jellyfin:
                   icon: sh-jellyfin.webp
                   description: Media server
                   href: https://jellyfin.alexlebens.net
                   siteMonitor: http://jellyfin.jellyfin:80
                   statusStyle: dot
-              - Jellyfin (Alt):
+              - Yamtrack:
-                  icon: sh-jellyfin.webp
-                  description: Media server (Alternate UI)
-                  href: https://jellyfin-vue.alexlebens.net
-                  siteMonitor: http://jellyfin-vue.jellyfin:80
-                  statusStyle: dot
-              - Media Requests:
-                  icon: sh-overseerr.webp
-                  description: Overseerr
-                  href: https://overseerr.alexlebens.net
-                  siteMonitor: http://overseerr.overseerr:80
-                  statusStyle: dot
-              - Media Requests (New):
-                  icon: sh-overseerr.webp
-                  description: Seerr
-                  href: https://seerr.alexlebens.net
-                  siteMonitor: http://seerr-seerr-chart.seerr:80
-                  statusStyle: dot
-              - Media Tracking:
                   icon: sh-yamtrack.webp
-                  description: Yamtrack
+                  description: Watched Media Tracking
                   href: https://yamtrack.alexlebens.net
                   siteMonitor: http://yamtrack.yamtrack:80
                   statusStyle: dot
@@ -175,7 +160,7 @@ homepage:
                   icon: sh-immich.webp
                   description: Immich
                   href: https://immich.alexlebens.net
-                  siteMonitor: http://immich.immich:2283
+                  siteMonitor: http://immich-main.immich:2283
                   statusStyle: dot
               - Pictures:
                   icon: sh-photoview.webp
@@ -190,14 +175,14 @@ homepage:
                   siteMonitor: http://audiobookshelf.audiobookshelf:80
                   statusStyle: dot
               - Books:
-                  icon: sh-booklore.webp
+                  icon: sh-calibre-web.webp
-                  description: Booklore
+                  description: Calibre Web Automated
-                  href: https://booklore.alexlebens.net
+                  href: https://calibre.alexlebens.net
-                  siteMonitor: http://booklore.booklore:80
+                  siteMonitor: http://calibre-web-automated-main.calibre-web-automated:8083
                   statusStyle: dot
           - Public:
               - Site:
-                  icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/logo-new-round.png
+                  icon: https://web-assets-3bfcb5585cbd63dc365d32a3.nyc3.cdn.digitaloceanspaces.com/alexlebens-net/icon_white.png
                   description: Profile Website
                   href: https://www.alexlebens.dev
                   siteMonitor: https://www.alexlebens.dev
@@ -257,6 +242,12 @@ homepage:
                   href: https://actual.alexlebens.net
                   siteMonitor: http://actual.actual:80
                   statusStyle: dot
+              - Project Management:
+                  icon: sh-eigenfocus.webp
+                  description: Eigenfocus
+                  href: https://eigenfocus.alexlebens.net
+                  siteMonitor: http://eigenfocus.eigenfocus:80
+                  statusStyle: dot
               - AI:
                   icon: sh-ollama.webp
                   description: Ollama
@@ -303,8 +294,8 @@ homepage:
               - Code (ps10rp):
                   icon: sh-gitea.webp
                   description: Gitea
-                  href: https://gitea-ps10rp.boreal-beaufort.ts.net
+                  href: https://gitea.lebens-home.net
-                  siteMonitor: https://gitea-ps10rp.boreal-beaufort.ts.net
+                  siteMonitor: https://gitea.lebens-home.net
                   statusStyle: dot
               - IDE (Public):
                   icon: sh-visual-studio-code.webp
@@ -328,7 +319,7 @@ homepage:
                   icon: sh-komodo-light.webp
                   description: Komodo
                   href: https://komodo.alexlebens.net
-                  siteMonitor: http://komodo-main.komodo:80
+                  siteMonitor: http://komodo.komodo:80
                   statusStyle: dot
           - Automation:
               - Deployment Workflows:
@@ -343,6 +334,12 @@ homepage:
                   href: https://n8n.alexlebens.net
                   siteMonitor: http://n8n-main.n8n:80
                   statusStyle: dot
+              - Jobs:
+                  icon: https://raw.githubusercontent.com/mshade/kronic/main/static/android-chrome-192x192.png
+                  description: Kronic
+                  href: https://kronic.alexlebens.net
+                  siteMonitor: http://kronic.kronic:80
+                  statusStyle: dot
               - Uptime:
                   icon: sh-gatus.webp
                   description: Gatus
@@ -501,17 +498,11 @@ homepage:
                   href: https://ceph.alexlebens.net
                   siteMonitor: http://rook-ceph-mgr-dashboard.rook-ceph:7000
                   statusStyle: dot
-              - Object Storage (NAS):
+              - Database:
-                  icon: sh-garage.webp
+                  icon: sh-pgadmin-light.webp
-                  description: Garage
+                  description: PGAdmin
-                  href: https://garage-webui.alexlebens.net
+                  href: https://pgadmin.alexlebens.net
-                  siteMonitor: http://garage-webui.garage:3909
+                  siteMonitor: http://pgadmin.pgadmin:80
-                  statusStyle: dot
-              - Object Storage (ps10rp):
-                  icon: sh-garage.webp
-                  description: Garage
-                  href: https://garage-ui-ps10rp.boreal-beaufort.ts.net
-                  siteMonitor: https://garage-ui-ps10rp.boreal-beaufort.ts.net
                   statusStyle: dot
               - Database:
                   icon: sh-whodb.webp
@@ -525,50 +516,6 @@ homepage:
                   href: https://vault.alexlebens.net
                   siteMonitor: http://vault.vault:8200
                   statusStyle: dot
-              - Backups:
-                  icon: sh-backrest-light.webp
-                  description: Backrest
-                  href: https://backrest.alexlebens.net
-                  siteMonitor: http://backrest.backrest:80
-                  statusStyle: dot
-          - Content:
-              - qUI:
-                  icon: https://raw.githubusercontent.com/autobrr/qui/8487c818886df9abb2b1456f43b54e0ba180a2bd/web/public/icons.svg
-                  description: qbitorrent
-                  href: https://qui.alexlebens.net
-                  siteMonitor: http://qbittorrent-qui.qbittorrent:80
-                  statusStyle: dot
-                  widget:
-                    type: qbittorrent
-                    url: http://qbittorrent.qbittorrent:8080
-                    enableLeechProgress: true
-              - Prowlarr:
-                  icon: sh-prowlarr.webp
-                  description: Indexers
-                  href: https://prowlarr.alexlebens.net
-                  siteMonitor: http://prowlarr.prowlarr:80
-                  statusStyle: dot
-              - Huntarr:
-                  icon: https://raw.githubusercontent.com/plexguide/Huntarr.io/main/frontend/static/logo/128.png
-                  description: Content upgrader
-                  href: https://huntarr.alexlebens.net
-                  siteMonitor: http://huntarr.huntarr:80
-                  statusStyle: dot
-              - Bazarr:
-                  icon: sh-bazarr.webp
-                  description: Subtitles
-                  href: https://bazarr.alexlebens.net
-                  siteMonitor: http://bazarr.bazarr:80
-                  statusStyle: dot
-              - Tdarr:
-                  icon: sh-tdarr.webp
-                  description: Media transcoding and health checks
-                  href: https://tdarr.alexlebens.net
-                  siteMonitor: http://tdarr-web.tdarr:8265
-                  statusStyle: dot
-                  widget:
-                    type: tdarr
-                    url: http://tdarr-web.tdarr:8265
           - TV Shows:
               - Sonarr:
                   icon: sh-sonarr.webp
@@ -679,19 +626,50 @@ homepage:
                   href: https://slskd.alexlebens.net
                   siteMonitor: http://slskd.slskd:5030
                   statusStyle: dot
-          - Books:
+          - Services (Servarr):
-              - Ephemera:
+              - qBittorrent:
-                  icon: sh-ephemera.webp
+                  icon: sh-qbittorrent.webp
-                  description: Books
+                  description: P2P Downloads
-                  href: https://ephemera.alexlebens.net
+                  href: https://qbittorrent.alexlebens.net
-                  siteMonitor: http://ephemera.ephemera:80
+                  siteMonitor: http://qbittorrent.qbittorrent:8080
                   statusStyle: dot
-              - Listenarr:
+                  widget:
-                  icon: sh-audiobookrequest.webp
+                    type: qbittorrent
-                  description: Audiobooks
+                    url: http://qbittorrent.qbittorrent:8080
-                  href: https://listenarr.alexlebens.net
+                    enableLeechProgress: true
-                  siteMonitor: http://listenarr.listenarr:80
+              - Prowlarr:
+                  icon: sh-prowlarr.webp
+                  description: Indexers
+                  href: https://prowlarr.alexlebens.net
+                  siteMonitor: http://prowlarr.prowlarr:80
                   statusStyle: dot
+              - Bazarr:
+                  icon: sh-bazarr.webp
+                  description: Indexers
+                  href: https://bazarr.alexlebens.net
+                  siteMonitor: http://bazarr.bazarr:80
+                  statusStyle: dot
+              - Huntarr:
+                  icon: https://raw.githubusercontent.com/plexguide/Huntarr.io/main/frontend/static/logo/128.png
+                  description: Indexers
+                  href: https://huntarr.alexlebens.net
+                  siteMonitor: http://huntarr.huntarr:80
+                  statusStyle: dot
+              - CWA Downloader:
+                  icon: sh-calibre.webp
+                  description: Calibre Web Automated Book Downloader
+                  href: https://calibre-downloader.alexlebens.net
+                  siteMonitor: http://calibre-web-automated-downloader.calibre-web-automated:8084
+                  statusStyle: dot
+              - Tdarr:
+                  icon: sh-tdarr.webp
+                  description: Media transcoding and health checks
+                  href: https://tdarr.alexlebens.net
+                  siteMonitor: http://tdarr-web.tdarr:8265
+                  statusStyle: dot
+                  widget:
+                    type: tdarr
+                    url: http://tdarr-web.tdarr:8265
           - Other Homes:
               - Dev:
                   icon: sh-homepage.webp

clusters/cl01tl/applications/huntarr/Chart.yaml

@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: huntarr
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/huntarr.png
-appVersion: 8.2.10
+appVersion: 7.0.0

clusters/cl01tl/applications/huntarr/values.yaml

@@ -9,7 +9,7 @@ huntarr:
         main:
           image:
             repository: ghcr.io/plexguide/huntarr
-            tag: 8.2.10
+            tag: 8.1.11
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -31,7 +31,7 @@ huntarr:
       forceRename: huntarr-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
-      size: 5Gi
+      size: 1Gi
       advancedMounts:
         main:
           main:

clusters/cl01tl/applications/immich/Chart.yaml

@@ -8,8 +8,10 @@ keywords:
 home: https://wiki.alexlebens.dev/s/9377ae08-2041-4b6d-bc2b-61a4f5e8faae
 sources:
   - https://github.com/immich-app/immich
+  - https://github.com/valkey-io/valkey
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
   - name: alexlebens
@@ -17,13 +19,13 @@ dependencies:
   - name: app-template
     alias: immich
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
+  - name: valkey
+    version: 3.0.20
+    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-16-cluster
-    version: 7.1.1
+    version: 5.1.0
-    repository: oci://harbor.alexlebens.net/helm-charts
-  - name: redis-replication
-    version: 0.5.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/immich.png
-appVersion: v2.3.1
+appVersion: v1.132.3

clusters/cl01tl/applications/immich/templates/external-secrets.yaml

@@ -0,0 +1,51 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: immich-config-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: immich-config-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: immich.json
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/immich/config
+        metadataPolicy: None
+        property: immich.json
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: immich-postgresql-16-cluster-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: immich-postgresql-16-cluster-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/postgres-backups
+        metadataPolicy: None
+        property: access
+    - secretKey: ACCESS_SECRET_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/postgres-backups
+        metadataPolicy: None
+        property: secret

clusters/cl01tl/applications/immich/templates/http-route.yaml

@@ -23,6 +23,6 @@ spec:
       backendRefs:
         - group: ''
           kind: Service
-          name: immich
+          name: immich-main
           port: 2283
           weight: 100

clusters/cl01tl/applications/immich/templates/persistent-volume-claim.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: listenarr-nfs-storage
+  name: immich-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: listenarr-nfs-storage
+    app.kubernetes.io/name: immich-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  volumeName: listenarr-nfs-storage
+  volumeName: immich-nfs-storage
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany

clusters/cl01tl/applications/immich/templates/persistent-volume.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: listenarr-nfs-storage
+  name: immich-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: listenarr-nfs-storage
+    app.kubernetes.io/name: immich-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -15,7 +15,7 @@ spec:
   accessModes:
     - ReadWriteMany
   nfs:
-    path: /volume2/Storage/Audiobooks
+    path: /volume2/Storage/Immich
     server: synologybond.alexlebens.net
   mountOptions:
     - vers=4

clusters/cl01tl/applications/immich/values.yaml

@@ -0,0 +1,253 @@
+immich:
+  controllers:
+    main:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      revisionHistoryLimit: 3
+      containers:
+        main:
+          image:
+            repository: ghcr.io/immich-app/immich-server
+            tag: v1.132.3
+            pullPolicy: IfNotPresent
+          env:
+            - name: TZ
+              value: US/Central
+            - name: IMMICH_TELEMETRY_INCLUDE
+              value: all
+            - name: IMMICH_CONFIG_FILE
+              value: /config/immich.json
+            - name: IMMICH_MACHINE_LEARNING_URL
+              value: http://immich-machine-learning.immich:3003
+            - name: REDIS_HOSTNAME
+              value: immich-valkey-primary
+            - name: DB_VECTOR_EXTENSION
+              value: pgvecto.rs
+            - name: DB_HOSTNAME
+              valueFrom:
+                secretKeyRef:
+                  name: immich-postgresql-16-cluster-app
+                  key: host
+            - name: DB_DATABASE_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: immich-postgresql-16-cluster-app
+                  key: dbname
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: immich-postgresql-16-cluster-app
+                  key: port
+            - name: DB_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: immich-postgresql-16-cluster-app
+                  key: user
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: immich-postgresql-16-cluster-app
+                  key: password
+          probes:
+            liveness:
+              enabled: true
+              custom: true
+              spec:
+                httpGet:
+                  path: /api/server/ping
+                  port: 2283
+                initialDelaySeconds: 0
+                periodSeconds: 10
+                timeoutSeconds: 1
+                failureThreshold: 3
+            readiness:
+              enabled: true
+              custom: true
+              spec:
+                httpGet:
+                  path: /api/server/ping
+                  port: 2283
+                initialDelaySeconds: 0
+                periodSeconds: 10
+                timeoutSeconds: 1
+                failureThreshold: 3
+            startup:
+              enabled: true
+              custom: true
+              spec:
+                httpGet:
+                  path: /api/server/ping
+                  port: 2283
+                initialDelaySeconds: 0
+                periodSeconds: 10
+                timeoutSeconds: 1
+                failureThreshold: 30
+          resources:
+            limits:
+              gpu.intel.com/i915: 1
+            requests:
+              gpu.intel.com/i915: 1
+              cpu: 10m
+              memory: 512Mi
+    machine-learning:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      revisionHistoryLimit: 3
+      containers:
+        main:
+          image:
+            repository: ghcr.io/immich-app/immich-machine-learning
+            tag: v1.134.0
+            pullPolicy: IfNotPresent
+          env:
+            - name: TRANSFORMERS_CACHE
+              value: /cache
+          probes:
+            liveness:
+              enabled: true
+              custom: true
+              spec:
+                httpGet:
+                  path: /ping
+                  port: 3003
+                initialDelaySeconds: 0
+                periodSeconds: 10
+                timeoutSeconds: 1
+                failureThreshold: 3
+            readiness:
+              enabled: true
+              custom: true
+              spec:
+                httpGet:
+                  path: /ping
+                  port: 3003
+                initialDelaySeconds: 0
+                periodSeconds: 10
+                timeoutSeconds: 1
+                failureThreshold: 3
+            startup:
+              enabled: false
+          resources:
+            limits:
+              gpu.intel.com/i915: 1
+            requests:
+              gpu.intel.com/i915: 1
+              cpu: 10m
+              memory: 256Mi
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 2283
+          targetPort: 2283
+          protocol: TCP
+        metrics-api:
+          port: 8081
+          targetPort: 8081
+          protocol: TCP
+        metrics-ms:
+          port: 8082
+          targetPort: 8082
+          protocol: TCP
+    machine-learning:
+      controller: machine-learning
+      ports:
+        http:
+          port: 3003
+          targetPort: 3003
+          protocol: TCP
+  persistence:
+    config:
+      enabled: true
+      type: secret
+      name: immich-config-secret
+      advancedMounts:
+        main:
+          main:
+            - path: /config/immich.json
+              readOnly: true
+              mountPropagation: None
+              subPath: immich.json
+    cache:
+      storageClass: ceph-block
+      accessMode: ReadWriteOnce
+      size: 10Gi
+      retain: true
+      advancedMounts:
+        machine-learning:
+          main:
+            - path: /cache
+              readOnly: false
+    media:
+      existingClaim: immich-nfs-storage
+      advancedMounts:
+        main:
+          main:
+            - path: /usr/src/app/upload
+              readOnly: false
+valkey:
+  architecture: replication
+  auth:
+    enabled: false
+    usePasswordFiles: false
+  primary:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 64Mi
+    persistence:
+      enabled: true
+      size: 1Gi
+  replica:
+    replicaCount: 1
+    resources:
+      requests:
+        cpu: 100m
+        memory: 64Mi
+    persistence:
+      enabled: true
+      size: 1Gi
+postgres-16-cluster:
+  # Tensorchord
+  #--- https://github.com/immich-app/immich/discussions/9060
+  #--- https://docs.pgvecto.rs/admin/kubernetes.html
+  #--- https://github.com/tensorchord/cloudnative-pgvecto.rs
+  #--- https://github.com/immich-app/immich/discussions/17025
+  type: tensorchord
+  mode: recovery
+  cluster:
+    image:
+      repository: ghcr.io/tensorchord/cloudnative-pgvecto.rs
+      tag: 16.3-v0.2.1
+    storage:
+      storageClass: local-path
+    walStorage:
+      storageClass: local-path
+    resources:
+      requests:
+        memory: 384Mi
+        cpu: 200m
+    monitoring:
+      enabled: true
+      prometheusRule:
+        enabled: true
+    postgresql:
+      parameters:
+        shared_buffers: 256MB
+  recovery:
+    method: objectStore
+    objectStore:
+      endpointURL: https://nyc3.digitaloceanspaces.com
+      destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/immich/immich-postgresql-17-cluster
+      endpointCredentials: immich-postgresql-17-cluster-backup-secret
+      recoveryIndex: 2
+  backup:
+    enabled: true
+    endpointURL: https://nyc3.digitaloceanspaces.com
+    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/immich/immich-postgresql-16-cluster
+    endpointCredentials: immich-postgresql-16-cluster-backup-secret
+    backupIndex: 2
+    retentionPolicy: "7d"

clusters/cl01tl/applications/jellyfin/Chart.yaml

@@ -20,6 +20,6 @@ dependencies:
   - name: app-template
     alias: jellyfin
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/jellyfin.png
-appVersion: 10.11.4
+appVersion: 10.10.7

clusters/cl01tl/applications/jellyfin/templates/http-route.yaml

@@ -1,10 +1,10 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-booklore
+  name: http-route-jellyfin
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-booklore
+    app.kubernetes.io/name: http-route-jellyfin
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -14,7 +14,7 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - booklore.alexlebens.net
+    - jellyfin.alexlebens.net
   rules:
     - matches:
       - path:
@@ -23,6 +23,6 @@ spec:
       backendRefs:
         - group: ''
           kind: Service
-          name: booklore
+          name: jellyfin
           port: 80
           weight: 100

clusters/cl01tl/applications/jellyfin/values.yaml

@@ -9,7 +9,7 @@ jellyfin:
         main:
           image:
             repository: ghcr.io/jellyfin/jellyfin
-            tag: 10.11.4
+            tag: 10.10.7
             pullPolicy: IfNotPresent
           env:
             - name: TZ
@@ -25,38 +25,14 @@ jellyfin:
               gpu.intel.com/i915: 1
               cpu: 1
               memory: 2Gi
-    vue:
-      type: deployment
-      replicas: 3
-      strategy: Recreate
-      revisionHistoryLimit: 3
-      containers:
-        main:
-          image:
-            repository: ghcr.io/jellyfin/jellyfin-vue
-            tag: unstable@sha256:0083110ab7def4f4e2eefe02b55bce92c40c72abc7efcd622dd5c24fc1ab48b2
-            pullPolicy: IfNotPresent
-          env:
-            - name: DEFAULT_SERVERS
-              value: https://jellyfin.alexlebens.net
-            - name: DISABLE_SERVER_SELECTION
-              value: true
   service:
     main:
-      forceRename: jellyfin
       controller: main
       ports:
         http:
           port: 80
           targetPort: 8096
           protocol: HTTP
-    vue:
-      controller: vue
-      ports:
-        http:
-          port: 80
-          targetPort: 80
-          protocol: HTTP
   persistence:
     config:
       forceRename: jellyfin-config

clusters/cl01tl/applications/jellystat/Chart.yaml

@@ -18,10 +18,10 @@ dependencies:
   - name: app-template
     alias: jellystat
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.1.2
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 7.1.1
+    version: 5.1.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/jellystat.png
 appVersion: 1.1.6

clusters/cl01tl/applications/jellystat/templates/external-secret.yaml

@@ -1,10 +1,47 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: radarr-config-backup-secret
+  name: jellystat-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-config-backup-secret
+    app.kubernetes.io/name: jellystat-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: secret-key
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/jellystat/auth
+        metadataPolicy: None
+        property: secret-key
+    - secretKey: user
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/jellystat/auth
+        metadataPolicy: None
+        property: user
+    - secretKey: password
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/jellystat/auth
+        metadataPolicy: None
+        property: password
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: jellystat-data-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: jellystat-data-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -16,7 +53,7 @@ spec:
       mergePolicy: Merge
       engineVersion: v2
       data:
-        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/radarr5/radarr5-config"
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/jellystat/jellystat-data"
   data:
     - secretKey: BUCKET_ENDPOINT
       remoteRef:
@@ -58,10 +95,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: radarr-postgresql-18-cluster-backup-secret
+  name: jellystat-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: jellystat-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -83,40 +120,3 @@ spec:
         key: /digital-ocean/home-infra/postgres-backups
         metadataPolicy: None
         property: secret
-
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: radarr-postgresql-18-cluster-backup-secret-garage
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: radarr-postgresql-18-cluster-backup-secret-garage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: ACCESS_KEY_ID
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_KEY_ID
-    - secretKey: ACCESS_SECRET_KEY
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_SECRET_KEY
-    - secretKey: ACCESS_REGION
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_REGION

clusters/cl01tl/applications/jellystat/values.yaml

@@ -32,27 +32,27 @@ jellystat:
             - name: POSTGRES_USER
               valueFrom:
                 secretKeyRef:
-                  name: jellystat-postgresql-18-cluster-app
+                  name: jellystat-postgresql-17-cluster-app
                   key: username
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: jellystat-postgresql-18-cluster-app
+                  name: jellystat-postgresql-17-cluster-app
                   key: password
             - name: POSTGRES_DB
               valueFrom:
                 secretKeyRef:
-                  name: jellystat-postgresql-18-cluster-app
+                  name: jellystat-postgresql-17-cluster-app
                   key: dbname
             - name: POSTGRES_IP
               valueFrom:
                 secretKeyRef:
-                  name: jellystat-postgresql-18-cluster-app
+                  name: jellystat-postgresql-17-cluster-app
                   key: host
             - name: POSTGRES_PORT
               valueFrom:
                 secretKeyRef:
-                  name: jellystat-postgresql-18-cluster-app
+                  name: jellystat-postgresql-17-cluster-app
                   key: port
           resources:
             requests:
@@ -78,57 +78,28 @@ jellystat:
           main:
             - path: /app/backend/backup-data
               readOnly: false
-postgres-18-cluster:
+postgres-17-cluster:
-  mode: recovery
+  mode: standalone
   cluster:
     storage:
       storageClass: local-path
     walStorage:
       storageClass: local-path
+    monitoring:
+      enabled: true
+      prometheusRule:
+        enabled: true
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/jellystat/jellystat-postgresql-18-cluster
+      endpointURL: https://nyc3.digitaloceanspaces.com
-      endpointURL: http://garage-main.garage:3900
+      destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/jellystat/jellystat-postgresql-17-cluster
-      index: 1
+      endpointCredentials: jellystat-postgresql-17-cluster-backup-secret
-      endpointCredentials: jellystat-postgresql-18-cluster-backup-secret-garage
+      recoveryIndex: 2
   backup:
-    objectStore:
+    enabled: true
-      - name: garage-local
+    endpointURL: https://nyc3.digitaloceanspaces.com
-        destinationPath: s3://postgres-backups/cl01tl/jellystat/jellystat-postgresql-18-cluster
+    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/jellystat/jellystat-postgresql-17-cluster
-        index: 1
+    endpointCredentials: jellystat-postgresql-17-cluster-backup-secret
-        endpointURL: http://garage-main.garage:3900
+    backupIndex: 2
-        endpointCredentials: jellystat-postgresql-18-cluster-backup-secret-garage
+    retentionPolicy: "3d"
-        endpointCredentialsIncludeRegion: true
-        retentionPolicy: "3d"
-        isWALArchiver: true
-      # - name: external
-      #   destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/jellystat/jellystat-postgresql-18-cluster
-      #   index: 1
-      #   retentionPolicy: "30d"
-      #   isWALArchiver: false
-      # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/jellystat/jellystat-postgresql-18-cluster
-      #   index: 1
-      #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: jellystat-postgresql-18-cluster-backup-secret-garage
-      #   retentionPolicy: "30d"
-      #   data:
-      #     compression: bzip2
-      #     jobs: 2
-    scheduledBackups:
-      - name: live-backup
-        suspend: false
-        immediate: true
-        schedule: "0 0 0 * * *"
-        backupName: garage-local
-      # - name: daily-backup
-      #   suspend: false
-      #   immediate: true
-      #   schedule: "0 0 0 * * *"
-      #   backupName: external
-      # - name: weekly-backup
-      #   suspend: true
-      #   immediate: true
-      #   schedule: "0 0 4 * * SAT"
-      #   backupName: garage-remote