Update php Docker tag to v8.5.0

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

@@ -0,0 +1,86 @@
+name: lint-test-docker
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'hosts/**'
+
+jobs:
+  docker-lint:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Check Branch Exists
+        id: check-branch-exists
+        uses: GuillaumeFalourd/branch-exists@v1.1
+        with:
+          branch: "${{ github.base_ref }}"
+
+      - name: Branch Does Not Exist
+        if: steps.check-branch-exists.outputs.exists == 'false'
+        run: echo "Branch ${{ github.base_ref }} was not found, likely already merged"
+
+      - name: Set up Node.js
+        if: steps.check-branch-exists.outputs.exists == 'true'
+        uses: actions/setup-node@v6
+        with:
+          node-version: '24'
+
+      - name: Lint Docker Compose
+        if: steps.check-branch-exists.outputs.exists == 'true'
+        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"
+
+          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-docker-push.yaml

@@ -0,0 +1,74 @@
+name: lint-test-docker
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'hosts/**'
+
+jobs:
+  docker-lint:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '24'
+
+      - name: Lint Docker Compose
+        run: |
+          set -e  # Exit immediately if a command exits with a non-zero status.
+
+          TARGET_BRANCH="origin/main"
+          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"
+
+          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: 4
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,failed
+          details: 'Docker linting on Push 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-push.yaml", "clear": true}]'
+          image: true

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

@@ -1,141 +0,0 @@
-name: lint-test-docker
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'hosts/**'
-
-  push:
-    branches:
-      - main
-    paths:
-      - 'hosts/**'
-
-env:
-  BASE_BRANCH: "origin/${{ gitea.base_ref }}"
-
-jobs:
-  lint-docker-compose:
-    runs-on: ubuntu-js
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        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 }}"
-
-      - name: Report Branch Exists
-        id: branch-exists
-        if: github.event_name == 'push' || steps.check-branch-exists.outputs.exists == 'true' && github.event_name == 'pull_request'
-        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'
-        uses: actions/setup-node@v6
-        with:
-          node-version: '24'
-
-      - 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'
-        env:
-          CHANGED_COMPOSE: ${{ steps.check-dir-changes.outputs.compose-dir }}
-        run: |
-          echo ">> Running dclint on changed compose files:"
-          echo "$CHANGED_COMPOSE"
-
-          for compose in $CHANGED_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-pull.yaml

@@ -0,0 +1,89 @@
+name: lint-test-helm
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'clusters/**'
+
+jobs:
+  helm-lint:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Check Branch Exists
+        id: check-branch-exists
+        uses: GuillaumeFalourd/branch-exists@v1.1
+        with:
+          branch: ${{ github.base_ref }}
+
+      - name: Branch Does Not Exist
+        if: steps.check-branch-exists.outputs.exists == 'false'
+        run: echo "Branch ${{ github.base_ref }} was not found, likely already merged"
+
+      - name: Set up Helm
+        if: steps.check-branch-exists.outputs.exists == 'true'
+        uses: azure/setup-helm@v4
+        with:
+          token: ${{ secrets.GITEA_TOKEN }}
+          version: v3.19.2
+
+      - name: Lint Helm Chart
+        if: steps.check-branch-exists.outputs.exists == 'true'
+        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" -- 'clusters/**')
+
+          echo ">> Found changed files:"
+          echo "$CHANGED_FILES"
+
+          # For each changed file, find its parent chart directory (the one with Chart.yaml).
+          # Then, create a unique list of those directories.
+          CHANGED_CHARTS=$(echo "$CHANGED_FILES" | while read -r file; do
+            dir=$(dirname "$file")
+            while [[ "$dir" != "." && ! -f "$dir/Chart.yaml" ]]; do
+              dir=$(dirname "$dir")
+            done
+            if [[ "$dir" != "." ]]; then
+              echo "$dir"
+            fi
+          done | sort -u)
+
+          if [[ -z "$CHANGED_CHARTS" ]]; then
+            echo ">> Could not determine changed charts. This could happen if only files outside a chart were changed."
+            exit 0
+          fi
+
+          echo ">> Running helm lint on changed charts:"
+          echo "$CHANGED_CHARTS"
+
+          echo "$CHANGED_CHARTS" | while read -r chart; do
+            echo ">> Building dependency for "$chart" ..."
+            helm dependency build "$chart"
+            echo ">> Linting $chart..."
+            helm lint "$chart"
+          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: 'Helm 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-helm-pull.yaml", "clear": true}]'
+          image: true

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

@@ -0,0 +1,77 @@
+name: lint-test-helm
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'clusters/**'
+
+jobs:
+  helm-lint:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          token: ${{ secrets.GITEA_TOKEN }}
+          version: v3.19.2
+
+      - name: Lint Helm Chart
+        run: |
+          set -e  # Exit immediately if a command exits with a non-zero status.
+
+          TARGET_BRANCH="origin/main"
+          echo ">> Target branch for diff is: $TARGET_BRANCH"
+
+          CHANGED_FILES=$(git diff --name-only "$TARGET_BRANCH" -- 'clusters/**')
+
+          echo ">> Found changed files:"
+          echo "$CHANGED_FILES"
+
+          # For each changed file, find its parent chart directory (the one with Chart.yaml).
+          # Then, create a unique list of those directories.
+          CHANGED_CHARTS=$(echo "$CHANGED_FILES" | while read -r file; do
+            dir=$(dirname "$file")
+            while [[ "$dir" != "." && ! -f "$dir/Chart.yaml" ]]; do
+              dir=$(dirname "$dir")
+            done
+            if [[ "$dir" != "." ]]; then
+              echo "$dir"
+            fi
+          done | sort -u)
+
+          if [[ -z "$CHANGED_CHARTS" ]]; then
+            echo ">> Could not determine changed charts. This could happen if only files outside a chart were changed."
+            exit 0
+          fi
+
+          echo ">> Running helm lint on changed charts:"
+          echo "$CHANGED_CHARTS"
+
+          echo "$CHANGED_CHARTS" | while read -r chart; do
+            echo ">> Building dependency for "$chart" ..."
+            helm dependency build "$chart"
+            echo ">> Linting $chart..."
+            helm lint "$chart"
+          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: 4
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,failed
+          details: 'Helm linting on Push 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-helm-push.yaml", "clear": true}]'
+          image: true

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

@@ -1,180 +0,0 @@
-name: lint-test-helm
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'clusters/cl01tl/helm/**'
-
-  push:
-    branches:
-      - main
-    paths:
-      - 'clusters/cl01tl/helm/**'
-
-env:
-  CLUSTER: cl01tl
-  BASE_BRANCH: "origin/${{ gitea.base_ref }}"
-
-jobs:
-  lint-helm:
-    runs-on: ubuntu-js
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        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 }}
-
-      - name: Report Branch Exists
-        id: branch-exists
-        if: github.event_name == 'push' || steps.check-branch-exists.outputs.exists == 'true' && github.event_name == 'pull_request'
-        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'
-        uses: azure/setup-helm@v4
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}
-          version: v3.19.2
-
-      - 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 " ")
-              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 echo "$cmd" | sh; 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'
-        env:
-          CHANGED_CHARTS: ${{ steps.check-dir-changes.outputs.chart-dir }}
-        run: |
-          echo ">> Running linting on changed charts ..."
-
-          for dir in ${CHANGED_CHARTS}; do
-            chart_path=clusters/${CLUSTER}/helm/$dir
-            chart_name=$(basename "$chart_path")
-
-            if [ -f "$chart_path/Chart.yaml" ]; then
-              cd $chart_path
-
-              echo ""
-              echo ">> Building helm dependency ..."
-              helm dependency build --skip-refresh
-
-              echo ""
-              echo ">> Linting helm ..."
-              helm lint --namespace "$chart_name"
-
-            else
-              echo ""
-              echo ">> Directory $chart_path does not contain a Chart.yaml. Skipping ..."
-              echo ""
-            fi
-          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: 'Helm 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-helm-pull.yaml", "clear": true}]'
-          image: true

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

@@ -1,427 +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 echo "$cmd" | sh; 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-merge.yaml

@@ -1,412 +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 echo "$cmd" | sh; 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,410 +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 echo "$cmd" | sh; 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.yaml

@@ -1,10 +1,16 @@
-name: render-manifests-dispatch
+name: render-manifests
 
 on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'clusters/cl01tl/helm/**'
+
   workflow_dispatch:
 
 env:
-  CLUSTER: cl01tl
+  CLUSTERS: cl01tl
   BASE_BRANCH: manifests
   BRANCH_NAME: auto/update-manifests
   ASSIGNEE: alexlebens
@@ -12,14 +18,13 @@ env:
   MANIFEST_DIR: /workspace/alexlebens/infrastructure/infrastructure-manifests
 
 jobs:
-  render-manifests-dispatch:
+  render-manifests-helm:
     runs-on: ubuntu-js
     steps:
-      - name: Checkout Main
+      - name: Checkout
         uses: actions/checkout@v6
         with:
           path: infrastructure
-          fetch-depth: 0
 
       - name: Checkout Manifests
         uses: actions/checkout@v6
@@ -53,143 +58,53 @@ jobs:
             git checkout -b $BRANCH_NAME
           fi
 
-          echo "----"
+          echo ">> Remove manfiest files and rebuild from source ..."
-
+          cd ${MANIFEST_DIR}/clusters
-      - name: Check which Directories have Changes
+          rm -rf ./*
-        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 cluster in ${CLUSTERS}; do
-          for dir in ${RENDER_DIR}; do
+            echo ">> Adding repositories for chart dependencies of cluster $cluster ..."
-            helm dependency list --max-col-width 120 ${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir 2> /dev/null \
+            for chart_path in ${MAIN_DIR}/clusters/$cluster/helm/*; do
+              helm dependency list --max-col-width 120 $chart_path 2> /dev/null \
                 | tail +2 | head -n -1 \
                 | awk '{ print "helm repo add " $1 " " $3 }' \
                 | while read cmd; do echo "$cmd" | sh; 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 cluster in ${CLUSTERS}; do
-
+            for chart_path in ${MAIN_DIR}/clusters/$cluster/helm/*; do
-          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/"
+                mkdir -p ${MANIFEST_DIR}/clusters/$cluster/manifests/$chart_name
-              TEMPLATE=""
+                OUTPUT_FILE="${MANIFEST_DIR}/clusters/$cluster/manifests/$chart_name/$chart_name.yaml"
-
-              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
+                helm dependency build
 
                 echo ""
                 echo ">> Linting helm ..."
-              helm lint --namespace "$chart_name"
+                helm lint --namespace "$chart_name" --with-subcharts
 
                 echo ""
                 echo ">> Rendering templates ..."
-              case "$chart_name" in
+                helm template "$chart_name" ./ --namespace "$chart_name" --include-crds > "$OUTPUT_FILE"
-                "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 ">> Manifests for $chart_name rendered to $OUTPUT_FILE"
-              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 ""
@@ -197,29 +112,22 @@ jobs:
                 echo ""
               fi
             done
-
+          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 git status --porcelain | grep -q .; then
-
-          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"
-
+            exit 0
           fi
 
-          echo "----"
-
       - name: Commit and Push Changes
         id: commit-push
         if: steps.check-changes.outputs.changes-detected == 'true'
@@ -230,12 +138,10 @@ jobs:
           git add .
           git commit -m "chore: Update manifests after change"
 
-          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
           echo ">> Pushing changes to $REPO_URL ..."
+          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
           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
 
@@ -249,7 +155,7 @@ jobs:
         run: |
           cd ${MANIFEST_DIR}
 
-          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls?base_branch=${BASE_BRANCH}&state=open&page=1"
+          API_ENDPOINT="${GITEA_URL}/api/v1/repos/${{ gitea.repository }}/pulls/${BASE_BRANCH}/${HEAD_BRANCH}"
 
           echo ">> Checking if PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
           echo ">> With Endpoint of:"
@@ -276,23 +182,17 @@ jobs:
           cat response_errors.txt
           echo "----"
 
-          if [ "$HTTP_STATUS" == "200" ] && [ "$(cat response_body.json | jq -r .[0].state)" == "open" ]; then
+          if [ "$HTTP_STATUS" == "200" ] && [$(cat response_body.json | jq -r .state) == "open"]; then
             echo ">> Pull Request has been found open, will update"
-            PR_INDEX=$(cat response_body.json | jq -r .[0].number)
+            PR_INDEX=$(cat response_body.json | jq -r .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'
@@ -311,7 +211,7 @@ jobs:
             --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}' )
+            '{head: $head, base: $base, assignee: $assignee, title: $title, body: $body'} )
 
           echo ">> Creating PR from branch ${HEAD_BRANCH} into ${BASE_BRANCH}"
           echo ">> With Endpoint of:"
@@ -345,22 +245,23 @@ jobs:
             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: Cleanup Branch
+        if: failure() && steps.create-pull-request.outcome == 'failure'
+        env:
+          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
+        run: |
+          echo ">> Removing branch: ${HEAD_BRANCH}"
+          git push origin --delete ${HEAD_BRANCH}
 
       - name: ntfy Created
         uses: niniyas/ntfy-action@master
@@ -372,7 +273,7 @@ jobs:
           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 }}!"
+          details: "Manifest rendering for Infrastructure has created a new Pull Request!"
           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}]'
 

clusters/cl01tl/deployment/argocd/Chart.yaml

@@ -15,7 +15,7 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: argo-cd
-    version: 9.1.7
+    version: 9.1.5
     repository: https://argoproj.github.io/argo-helm
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/argo-cd.png
-appVersion: v3.2.1
+appVersion: 3.0.0

clusters/cl01tl/deployment/argocd/values.yaml

@@ -25,7 +25,6 @@ argo-cd:
           id: authentik
     params:
       server.insecure: true
-      controller.diff.server.side: true
     rbac:
       policy.csv: |
         g, ArgoCD Admins, role:admin
@@ -61,7 +60,7 @@ argo-cd:
     enabled: true
     auth: false
   redisSecretInit:
-    enabled: false
+    enabled: true
   server:
     replicas: 2
     extensions:
@@ -280,7 +279,7 @@ argo-cd:
         - description: Application has degraded
           send:
             - app-health-degraded
-          when: app.status.health.status == 'Degraded'
+          when: app.status.health.status == 'Degraded' and time.Now().Sub(time.Parse(app.status.health.lastTransitionTime).Minutes() >= 15
       trigger.on-sync-failed: |
         - description: Application syncing has failed
           send:

clusters/cl01tl/deployment/stack/Chart.yaml

@@ -0,0 +1,16 @@
+apiVersion: v2
+name: stack
+version: 1.0.0
+description: Stack
+keywords:
+  - argo-cd
+  - stack
+  - deployment
+home: https://wiki.alexlebens.dev/s/0c2d1896-710d-4972-9bc8-08d71987428a
+sources:
+  - https://github.com/argoproj/argo-cd
+  - https://gitea.alexlebens.dev/alexlebens/infrastructure
+maintainers:
+  - name: alexlebens
+icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/argo-cd.png
+appVersion: 1.0.0

clusters/cl01tl/deployment/stack/templates/application-set.yaml

@@ -0,0 +1,59 @@
+{{- range $index, $stack := .Values.applicationSet }}
+---
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: {{ $stack.name }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ $stack.name }}
+    app.kubernetes.io/instance: {{ $stack.name }}
+    app.kubernetes.io/part-of: {{ $.Release.Name }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  syncPolicy:
+    applicationsSync: create-update
+    preserveResourcesOnDeletion: true
+  generators:
+    - git:
+        repoURL: {{ $.Values.git.repo }}
+        revision: {{ $.Values.git.revision }}
+        directories:
+          - path: "clusters/{{ $.Values.cluster.name }}/{{ $stack.name }}/*"
+  template:
+    metadata:
+      name: '{{ `{{path.basename}}` }}'
+    spec:
+      destination:
+        name: in-cluster
+        namespace: '{{ $stack.namespace | default `{{path.basename}}` }}'
+      project: default
+      revisionHistoryLimit: 3
+      source:
+        repoURL: {{ $.Values.git.repo }}
+        targetRevision: {{ $.Values.git.revision }}
+        path: '{{ `{{path}}` }}'
+        helm:
+          releaseName: "{{ `{{path.basename}}` }}"
+      {{- if $stack.ignoreDifferences }}
+      ignoreDifferences:
+        {{- toYaml $stack.ignoreDifferences | nindent 8 }}
+      {{ end }}
+      syncPolicy:
+        automated:
+          prune: {{ $stack.syncPolicy.automated.prune | default false }}
+          selfHeal: {{ $stack.syncPolicy.automated.selfHeal | default false }}
+        retry:
+          limit: 3
+          backoff:
+            duration: 1m
+            factor: 2
+            maxDuration: 15m
+        syncOptions:
+          - CreateNamespace={{ $stack.syncPolicy.syncOptions.createNamespace | default true }}
+          - ApplyOutOfSyncOnly={{ $stack.syncPolicy.syncOptions.applyOutOfSyncOnly | default true }}
+          - ServerSideApply={{ $stack.syncPolicy.syncOptions.serverSideApply | default true }}
+          - PruneLast={{ $stack.syncPolicy.syncOptions.pruneLast | default true }}
+          - RespectIgnoreDifferences={{ $stack.syncPolicy.syncOptions.respectIgnoreDifferences | default true }}
+{{- end }}

clusters/cl01tl/deployment/stack/templates/application.yaml

@@ -0,0 +1,192 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cilium
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: cilium
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: {{ .Values.git.repo }}
+    targetRevision: {{ .Values.git.revision }}
+    path: clusters/{{ .Values.cluster.name }}/standalone/cilium
+  destination:
+    name: in-cluster
+    namespace: kube-system
+  revisionHistoryLimit: 3
+  ignoreDifferences:
+    - group: monitoring.coreos.com
+      kind: ServiceMonitor
+      jqPathExpressions:
+        - .spec.endpoints[]?.relabelings[]?.action
+  syncPolicy:
+    automated:
+      prune: true
+    retry:
+      limit: 10
+      backoff:
+        duration: 1m
+        factor: 2
+        maxDuration: 16m
+    syncOptions:
+      - CreateNamespace=false
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - PruneLast=true
+      - RespectIgnoreDifferences=true
+
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: coredns
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: coredns
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: {{ .Values.git.repo }}
+    targetRevision: {{ .Values.git.revision }}
+    path: clusters/{{ .Values.cluster.name }}/standalone/coredns
+  destination:
+    name: in-cluster
+    namespace: kube-system
+  revisionHistoryLimit: 10
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    retry:
+      limit: 10
+      backoff:
+        duration: 1m
+        factor: 2
+        maxDuration: 16m
+    syncOptions:
+      - CreateNamespace=false
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - PruneLast=true
+
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: metrics-server
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: metrics-server
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: {{ .Values.git.repo }}
+    targetRevision: {{ .Values.git.revision }}
+    path: clusters/{{ .Values.cluster.name }}/standalone/metrics-server
+  destination:
+    name: in-cluster
+    namespace: kube-system
+  revisionHistoryLimit: 3
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    retry:
+      limit: 10
+      backoff:
+        duration: 1m
+        factor: 2
+        maxDuration: 16m
+    syncOptions:
+      - CreateNamespace=false
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - PruneLast=true
+
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kubelet-serving-cert-approver
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: kubelet-serving-cert-approver
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: {{ .Values.git.repo }}
+    targetRevision: {{ .Values.git.revision }}
+    path: clusters/{{ .Values.cluster.name }}/standalone/kubelet-serving-cert-approver
+  destination:
+    name: in-cluster
+    namespace: kubelet-serving-cert-approver
+  revisionHistoryLimit: 3
+  syncPolicy:
+    automated:
+      prune: true
+    retry:
+      limit: 10
+      backoff:
+        duration: 1m
+        factor: 2
+        maxDuration: 16m
+    syncOptions:
+      - CreateNamespace=true
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - PruneLast=true
+
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: prometheus-operator-crds
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: prometheus-operator-crds
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: {{ .Values.git.repo }}
+    targetRevision: {{ .Values.git.revision }}
+    path: clusters/{{ .Values.cluster.name }}/standalone/prometheus-operator-crds
+  destination:
+    name: in-cluster
+    namespace: kube-system
+  revisionHistoryLimit: 3
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: false
+    retry:
+      limit: 10
+      backoff:
+        duration: 1m
+        factor: 2
+        maxDuration: 16m
+    syncOptions:
+      - CreateNamespace=false
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - PruneLast=true

clusters/cl01tl/deployment/stack/values.yaml

@@ -0,0 +1,112 @@
+cluster:
+  name: cl01tl
+git:
+  # repo: git@github.com:alexlebens/infrastructure.git
+  # repo: https://github.com/alexlebens/infrastructure.git
+  repo: http://gitea-http.gitea:3000/alexlebens/infrastructure
+  # repo: ssh://git@gitea-ssh.gitea/alexlebens/infrastructure
+  revision: HEAD
+applicationSet:
+  - name: applications
+    ignoreDifferences:
+      - group: ""
+        kind: Service
+        jqPathExpressions:
+          - .spec.externalName
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true
+  - name: deployment
+    namespace: argocd
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true
+  - name: management
+    ignoreDifferences:
+      - group: ""
+        kind: Service
+        jqPathExpressions:
+          - .spec.externalName
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true
+  - name: monitoring
+    ignoreDifferences:
+      - group: ""
+        kind: Service
+        jqPathExpressions:
+          - .spec.externalName
+      - group: "apps"
+        kind: StatefulSet
+        jqPathExpressions:
+          - .spec.volumeClaimTemplates[]?.apiVersion
+          - .spec.volumeClaimTemplates[]?.kind
+          - .spec.volumeClaimTemplates[]?.metadata.creationTimestamp
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true
+  - name: platform
+    ignoreDifferences:
+      - group: ""
+        kind: Service
+        jqPathExpressions:
+          - .spec.externalName
+      - group: "apps"
+        kind: StatefulSet
+        jqPathExpressions:
+          - .spec.volumeClaimTemplates[]?.apiVersion
+          - .spec.volumeClaimTemplates[]?.kind
+          - .spec.volumeClaimTemplates[]?.metadata.creationTimestamp
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true
+  - name: services
+    ignoreDifferences:
+      - group: ""
+        kind: GpuDevicePlugin
+        jqPathExpressions:
+          - .metadata.annotations[]
+      - group: "apps"
+        kind: "Deployment"
+        jsonPointers:
+          - /spec/template/metadata/annotations/checksum~1secret
+          - /spec/template/metadata/annotations/checksum~1secret-core
+          - /spec/template/metadata/annotations/checksum~1secret-jobservice
+          - /spec/template/metadata/annotations/checksum~1tls
+      - group: "apps"
+        kind: "StatefulSet"
+        jsonPointers:
+          - /spec/template/metadata/annotations/checksum~1secret
+          - /spec/template/metadata/annotations/checksum~1tls
+      - group: "apps"
+        kind: StatefulSet
+        jqPathExpressions:
+          - .spec.volumeClaimTemplates[]?.apiVersion
+          - .spec.volumeClaimTemplates[]?.kind
+          - .spec.volumeClaimTemplates[]?.metadata.creationTimestamp
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true
+  - name: storage
+    ignoreDifferences:
+      - group: ""
+        kind: Service
+        jqPathExpressions:
+          - .spec.externalName
+    syncPolicy:
+      automated:
+        prune: true
+      syncOptions:
+        serverSideApply: true

clusters/cl01tl/helm/actual/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:926b8da839684072fd79954aff0c9852c2ff3b618b0fa35177bdec8e2dff4986
+digest: sha256:b5d823171e1b4dc1d3856f782f0c67cbb5d49e4fa170df2f21b06303c7aff7f5
-generated: "2025-12-05T17:02:01.15162583Z"
+generated: "2025-11-30T21:05:19.732832-06:00"

clusters/cl01tl/helm/actual/Chart.yaml

@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: actual
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/actual-budget.png
-appVersion: 25.12.0
+appVersion: 25.11.0

clusters/cl01tl/helm/actual/values.yaml

@@ -9,7 +9,7 @@ actual:
         main:
           image:
             repository: ghcr.io/actualbudget/actual
-            tag: 25.12.0
+            tag: 25.11.0
             pullPolicy: IfNotPresent
           env:
             - name: TZ

clusters/cl01tl/helm/argo-workflows/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: argo-workflows
   repository: https://argoproj.github.io/argo-helm
-  version: 0.46.2
+  version: 0.45.28
 - name: argo-events
   repository: https://argoproj.github.io/argo-helm
-  version: 2.4.19
+  version: 2.4.17
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:40a93dfcabbc5746682bac631e9a620588cf0cb6fdf79a42446a823e93a531c8
+digest: sha256:b00fd479a9d9e606661b3799182c8e24395b4f531f8d2bda87bdc5db16a8d66c
-generated: "2025-12-11T15:49:57.970719-06:00"
+generated: "2025-12-01T19:55:40.18149-06:00"

clusters/cl01tl/helm/argo-workflows/Chart.yaml

@@ -18,14 +18,14 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: argo-workflows
-    version: 0.46.2
+    version: 0.45.28
     repository: https://argoproj.github.io/argo-helm
   - name: argo-events
-    version: 2.4.19
+    version: 2.4.17
     repository: https://argoproj.github.io/argo-helm
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/argo-cd.png
-appVersion: v3.7.6
+appVersion: v3.6.7

clusters/cl01tl/helm/argo-workflows/templates/external-secret.yaml

@@ -31,10 +31,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: argo-workflows-postgresql-18-cluster-backup-secret
+  name: argo-workflows-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: argo-workflows-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: argo-workflows-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -61,10 +61,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: argo-workflows-postgresql-18-cluster-backup-secret-garage
+  name: argo-workflows-postgresql-17-cluster-backup-secret-garage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: argo-workflows-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: argo-workflows-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/argo-workflows/values.yaml

@@ -9,15 +9,15 @@ argo-workflows:
       nodeStatusOffLoad: true
       archive: true
       postgresql:
-        host: argo-workflows-postgresql-18-cluster-rw
+        host: argo-workflows-postgresql-17-cluster-rw
         port: 5432
         database: app
         tableName: app
         userNameSecret:
-          name: argo-workflows-postgresql-18-cluster-app
+          name: argo-workflows-postgresql-17-cluster-app
           key: username
         passwordSecret:
-          name: argo-workflows-postgresql-18-cluster-app
+          name: argo-workflows-postgresql-17-cluster-app
           key: password
         ssl: false
         sslMode: disable
@@ -59,6 +59,20 @@ argo-workflows:
   useStaticCredentials: true
   artifactRepository:
     archiveLogs: false
+    s3: {}
+      # accessKeySecret:
+      #   name: "{{ .Release.Name }}-minio"
+      #   key: accesskey
+      # secretKeySecret:
+      #   name: "{{ .Release.Name }}-minio"
+      #   key: secretkey
+      # insecure: true
+      # bucket:
+      # endpoint:
+      # region:
+      # encryptionOptions:
+      #   enableEncryption: true
+
 argo-events:
   controller:
     resources:
@@ -75,12 +89,9 @@ argo-events:
       requests:
         cpu: 10m
         memory: 128Mi
-postgres-18-cluster:
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -92,30 +103,30 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: argo-workflows-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: argo-workflows-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/argo-workflows/argo-workflows-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/argo-workflows/argo-workflows-postgresql-17-cluster
         index: 1
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
-        endpointCredentials: argo-workflows-postgresql-18-cluster-backup-secret-garage
+        endpointCredentials: argo-workflows-postgresql-17-cluster-backup-secret-garage
         endpointCredentialsIncludeRegion: true
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: argo-workflows-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: argo-workflows-postgresql-17-cluster-backup-secret-garage
       #   endpointCredentialsIncludeRegion: true
       #   retentionPolicy: "30d"
       #   data:
@@ -123,7 +134,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -133,6 +143,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: true
-      #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote

clusters/cl01tl/helm/argocd/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: argo-cd
-  repository: https://argoproj.github.io/argo-helm
-  version: 9.1.7
-digest: sha256:ed1ae26f3e642750f6dd970c1adc4fa14a627fad13daf74169213199f74425b3
-generated: "2025-12-09T23:01:55.027301875Z"

clusters/cl01tl/helm/audiobookshelf/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:977ed15091e9ed30d647a626214701d22f3a8a5232a900e33f753cc7e090042f
+digest: sha256:f3a9990542f24965fadad0b5493059b78cdc3fae91c8214577fa6f41ca5f7de3
-generated: "2025-12-05T17:02:13.674405673Z"
+generated: "2025-11-30T21:05:21.317114-06:00"

clusters/cl01tl/helm/audiobookshelf/Chart.yaml

@@ -18,6 +18,6 @@ dependencies:
   - name: app-template
     alias: audiobookshelf
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/audiobookshelf.png
-appVersion: 2.31.0
+appVersion: 2.21.0

clusters/cl01tl/helm/audiobookshelf/values.yaml

@@ -9,7 +9,7 @@ audiobookshelf:
         main:
           image:
             repository: ghcr.io/advplyr/audiobookshelf
-            tag: 2.31.0
+            tag: 2.30.0
             pullPolicy: IfNotPresent
           env:
             - name: TZ

clusters/cl01tl/helm/authentik/Chart.lock

@@ -4,9 +4,9 @@ dependencies:
   version: 2025.10.2
 - name: cloudflared
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.23.2
+  version: 1.23.0
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:fdd5cc597cf958ca0f6f43dd403915c89c45718eff80920c2d322264dc8b09e1
+digest: sha256:ad51c94c1125890ef60d179205d14c55eb9fdbc2702e3455e233042a48d00146
-generated: "2025-12-11T16:14:14.729827-06:00"
+generated: "2025-12-01T20:25:07.016724-06:00"

clusters/cl01tl/helm/authentik/Chart.yaml

@@ -26,10 +26,10 @@ dependencies:
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.23.0
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/authentik.png
-appVersion: 2025.10.2
+appVersion: 2025.4.1

clusters/cl01tl/helm/authentik/templates/external-secret.yaml

@@ -47,10 +47,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: authentik-postgresql-18-cluster-backup-secret
+  name: authentik-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: authentik-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: authentik-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -77,10 +77,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: authentik-postgresql-18-cluster-backup-secret-garage
+  name: authentik-postgresql-17-cluster-backup-secret-garage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: authentik-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: authentik-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/authentik/templates/redis-replication.yaml

@@ -13,7 +13,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.0.3
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -29,4 +29,4 @@ spec:
             storage: 1Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.48.0

clusters/cl01tl/helm/authentik/values.yaml

@@ -9,22 +9,22 @@ authentik:
       - name: AUTHENTIK_POSTGRESQL__HOST
         valueFrom:
           secretKeyRef:
-            name: authentik-postgresql-18-cluster-app
+            name: authentik-postgresql-17-cluster-app
             key: host
       - name: AUTHENTIK_POSTGRESQL__NAME
         valueFrom:
           secretKeyRef:
-            name: authentik-postgresql-18-cluster-app
+            name: authentik-postgresql-17-cluster-app
             key: dbname
       - name: AUTHENTIK_POSTGRESQL__USER
         valueFrom:
           secretKeyRef:
-            name: authentik-postgresql-18-cluster-app
+            name: authentik-postgresql-17-cluster-app
             key: user
       - name: AUTHENTIK_POSTGRESQL__PASSWORD
         valueFrom:
           secretKeyRef:
-            name: authentik-postgresql-18-cluster-app
+            name: authentik-postgresql-17-cluster-app
             key: password
   authentik:
     redis:
@@ -50,12 +50,9 @@ authentik:
     enabled: false
 cloudflared:
   existingSecretName: authentik-cloudflared-secret
-postgres-18-cluster:
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -67,30 +64,30 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/authentik/authentik-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/authentik/authentik-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: authentik-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: authentik-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/authentik/authentik-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/authentik/authentik-postgresql-17-cluster
         index: 1
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/authentik/authentik-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/authentik/authentik-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
-        endpointCredentials: authentik-postgresql-18-cluster-backup-secret-garage
+        endpointCredentials: authentik-postgresql-17-cluster-backup-secret-garage
         endpointCredentialsIncludeRegion: true
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/authentik/authentik-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/authentik/authentik-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: authentik-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: authentik-postgresql-17-cluster-backup-secret-garage
       #   retentionPolicy: "30d"
       #   data:
       #     compression: bzip2
@@ -98,7 +95,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -108,6 +104,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: false
-      #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote

clusters/cl01tl/helm/backrest/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:6e6f20320a485b57288a6febae1b7623076059c370f88b7fbe92460fc4047db3
+digest: sha256:aa797b99d6d8b7aafe142811938408b7f234df6d429a7e076196337cc63876cb
-generated: "2025-12-05T17:02:26.599646463Z"
+generated: "2025-12-01T20:25:09.888407-06:00"

clusters/cl01tl/helm/backrest/Chart.yaml

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

clusters/cl01tl/helm/bazarr/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:54c88d51b4067dec5b22623957970b64092bf3f417fabb58277f6bc3e01eca20
+digest: sha256:c6f6d1f2fb9fedf54094920737a6f0bd1a2ab89f0a4122966ca98f6c9d3f11fa
-generated: "2025-12-05T17:02:40.843820962Z"
+generated: "2025-11-30T21:05:22.694344-06:00"

clusters/cl01tl/helm/bazarr/Chart.yaml

@@ -18,6 +18,6 @@ dependencies:
   - name: app-template
     alias: bazarr
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/bazarr.png
-appVersion: 1.5.3
+appVersion: 1.5.2

clusters/cl01tl/helm/bazarr/values.yaml

@@ -15,7 +15,7 @@ bazarr:
         main:
           image:
             repository: ghcr.io/linuxserver/bazarr
-            tag: 1.5.3@sha256:4aa1e82d1e96ae712095d881b7e3840e6db6ca862c335be5b00001f31156650b
+            tag: 1.5.3@sha256:2be164c02c0bb311b6c32e57d3d0ddc2813d524e89ab51a3408c1bf6fafecda5
             pullPolicy: IfNotPresent
           env:
             - name: TZ

clusters/cl01tl/helm/blocky/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:b8516161886b87344848ad2b3bdafbd66da61ca8ffc5e9a5ebed462f205c9912
+digest: sha256:0009729bcf7f1941401b767fd4ae952b7a8d44f80053090b4a9224de912a14ef
-generated: "2025-12-05T17:02:59.562863413Z"
+generated: "2025-12-01T20:25:13.511406-06:00"

clusters/cl01tl/helm/blocky/Chart.yaml

@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: blocky
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/blocky.png
-appVersion: v0.28.2
+appVersion: v0.25

clusters/cl01tl/helm/blocky/templates/redis-replication.yaml

@@ -13,7 +13,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.0.3
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -29,4 +29,4 @@ spec:
             storage: 1Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.48.0

clusters/cl01tl/helm/blocky/values.yaml

@@ -156,7 +156,6 @@ blocky:
               radarr-anime                    IN      CNAME   traefik-cl01tl
               radarr-standup                  IN      CNAME   traefik-cl01tl
               searxng                         IN      CNAME   traefik-cl01tl
-              seerr                           IN      CNAME   traefik-cl01tl
               slskd                           IN      CNAME   traefik-cl01tl
               sonarr                          IN      CNAME   traefik-cl01tl
               sonarr-4k                       IN      CNAME   traefik-cl01tl

clusters/cl01tl/helm/booklore/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
 - name: mariadb-cluster
   repository: https://helm.mariadb.com/mariadb-operator
   version: 25.10.2
-digest: sha256:58d978bd46c61285b06acc6d9a40404d8059f2df7b953dea13c528b35350d0a8
+digest: sha256:264725306c1d1f38140293c0820abdc7e8aa4f39764b4d91e20200705ce2ec91
-generated: "2025-12-05T17:03:15.7199669Z"
+generated: "2025-11-30T21:05:24.649316-06:00"

clusters/cl01tl/helm/booklore/Chart.yaml

@@ -16,9 +16,9 @@ dependencies:
   - name: app-template
     alias: booklore
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
   - name: mariadb-cluster
     version: 25.10.2
     repository: https://helm.mariadb.com/mariadb-operator
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/booklore.png
-appVersion: v1.13.2
+appVersion: v.1.10.0

clusters/cl01tl/helm/booklore/values.yaml

@@ -9,7 +9,7 @@ booklore:
         main:
           image:
             repository: ghcr.io/booklore-app/booklore
-            tag: v1.13.2
+            tag: v1.12.0
             pullPolicy: IfNotPresent
           env:
             - name: TZ

clusters/cl01tl/helm/cert-manager/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cert-manager
   repository: https://charts.jetstack.io
-  version: v1.19.2
+  version: v1.19.1
-digest: sha256:b02bda9b9f2fc886af11d017a27a5761513defee603f9e3aa1d7add2749b925c
+digest: sha256:0b1238a5552bc6d457d4b1a2a1f387a3e7f2c19f820ecb64e14d20481a1ed1ce
-generated: "2025-12-10T15:01:57.196895547Z"
+generated: "2025-12-01T20:25:17.762628-06:00"

clusters/cl01tl/helm/cert-manager/Chart.yaml

@@ -14,7 +14,7 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: cert-manager
-    version: v1.19.2
+    version: v1.19.1
     repository: https://charts.jetstack.io
 icon: https://raw.githubusercontent.com/walkxcode/dashboard-icons/main/png/cert-manager.png
-appVersion: v1.19.2
+appVersion: v1.17.2

clusters/cl01tl/helm/cilium/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: cilium
-  repository: https://helm.cilium.io/
-  version: 1.18.4
-digest: sha256:e38eb92ee87c9a52b0f45a2451142ade02bac7d484b246d32379eacce3800bc8
-generated: "2025-12-02T17:17:49.043599-06:00"

clusters/cl01tl/helm/cloudnative-pg/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: cloudnative-pg
   repository: https://cloudnative-pg.io/charts/
-  version: 0.27.0
+  version: 0.26.1
 - name: plugin-barman-cloud
   repository: https://cloudnative-pg.io/charts/
   version: 0.3.1
-digest: sha256:14aa30b7bf75571b03bda19af68cd50c1e7908b883351b196a260609a5b85551
+digest: sha256:b38e5104d77ab1737a27a2542eda958e82038443940f07b7c2cbe3b0a477e1e6
-generated: "2025-12-10T19:25:17.952954019Z"
+generated: "2025-12-01T20:25:20.341325-06:00"

clusters/cl01tl/helm/cloudnative-pg/Chart.yaml

@@ -16,10 +16,10 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: cloudnative-pg
-    version: 0.27.0
+    version: 0.26.1
     repository: https://cloudnative-pg.io/charts/
   - name: plugin-barman-cloud
     version: 0.3.1
     repository: https://cloudnative-pg.io/charts/
 icon: https://avatars.githubusercontent.com/u/100373852?s=200&v=4
-appVersion: 1.28.0
+appVersion: 1.26.0

clusters/cl01tl/helm/code-server/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
 - name: cloudflared
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.23.2
+  version: 1.23.0
-digest: sha256:3cf78630cd7670e1157a87fc7ccbeca248ef4ced8a3170e69140ea3e1b0ff564
+digest: sha256:99eb4f940077dc916f5425d196232fcd363223fa7b7b5d3889f5965aa59e26f5
-generated: "2025-12-07T02:54:11.675097664Z"
+generated: "2025-11-30T21:05:26.699161-06:00"

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

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

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

@@ -9,7 +9,7 @@ code-server:
         main:
           image:
             repository: ghcr.io/linuxserver/code-server
-            tag: 4.106.3@sha256:aab9520fe923b2d93dccc2c806f3dc60649c2f4a2847fcd40c942227d0f1ae8f
+            tag: 4.106.2@sha256:a98afdbcb59559f11e5e8df284062e55da1076b2e470e13db4aae133ea82bad0
             pullPolicy: IfNotPresent
           env:
             - name: TZ

clusters/cl01tl/helm/coredns/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: coredns
-  repository: https://coredns.github.io/helm
-  version: 1.45.0
-digest: sha256:cfcb22a7d0bce4d6000800706597ae43faec74255f1deb5cc3279b2d0a81f6c6
-generated: "2025-12-02T17:17:52.206039-06:00"

clusters/cl01tl/helm/descheduler/Chart.yaml

@@ -17,4 +17,4 @@ dependencies:
     version: 0.34.0
     repository: https://kubernetes-sigs.github.io/descheduler/
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/kubernetes.png
-appVersion: 0.34.0
+appVersion: 0.33.0

clusters/cl01tl/helm/descheduler/values.yaml

@@ -39,27 +39,16 @@ descheduler:
           - name: RemovePodsViolatingNodeTaints
           - name: RemovePodsViolatingInterPodAntiAffinity
           - name: RemovePodsViolatingTopologySpreadConstraint
-          - name: "HighNodeUtilization"
-            args:
-              thresholds:
-                cpu : 80
-                memory: 80
-                pods: 90
-              evictableNamespaces:
-                exclude:
-                  - "kube-system"
-              evictionModes:
-                - "OnlyThresholdingResources"
           - name: LowNodeUtilization
             args:
               thresholds:
-                cpu: 30
+                cpu: 20
-                memory: 30
+                memory: 20
-                pods: 50
+                pods: 20
               targetThresholds:
                 cpu: 60
-                memory: 40
+                memory: 60
-                pods: 80
+                pods: 60
         plugins:
           balance:
             enabled:

clusters/cl01tl/helm/directus/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
 - name: cloudflared
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.23.2
+  version: 1.23.0
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:636b200b79efdd6ea36afdf29a5e85f3741b362dfcbf2af47c7aff9e55f02812
+digest: sha256:2f3d9f7a8d8d71b19ff3292993647d22a89aa6c444a6f0819b82cd0a577f1ebc
-generated: "2025-12-11T16:47:16.317535-06:00"
+generated: "2025-11-30T21:05:28.43692-06:00"

clusters/cl01tl/helm/directus/Chart.yaml

@@ -20,14 +20,14 @@ dependencies:
   - name: app-template
     alias: directus
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
   - name: cloudflared
     alias: cloudflared-directus
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.23.0
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.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/helm/directus/templates/external-secret.yaml

@@ -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:
@@ -181,10 +181,40 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: directus-postgresql-18-cluster-backup-secret-garage
+  name: directus-postgresql-17-cluster-backup-secret-weekly
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: directus-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: directus-postgresql-17-cluster-backup-secret-weekly
+    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
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: directus-postgresql-17-cluster-backup-secret-garage
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: directus-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/directus/templates/redis-replication.yaml

@@ -13,7 +13,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.2.1
     imagePullPolicy: IfNotPresent
     redisSecret:
       name: directus-redis-config
@@ -32,4 +32,4 @@ spec:
             storage: 1Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.76.0

clusters/cl01tl/helm/directus/templates/redis-sentinel.yaml

@@ -19,7 +19,7 @@ spec:
         name: directus-redis-config
         key: password
   kubernetesConfig:
-    image: quay.io/opstree/redis-sentinel:v8.4.0
+    image: quay.io/opstree/redis-sentinel:v7.0.15
     imagePullPolicy: IfNotPresent
     redisSecret:
       name: directus-redis-config

clusters/cl01tl/helm/directus/values.yaml

@@ -9,7 +9,7 @@ directus:
         main:
           image:
             repository: directus/directus
-            tag: 11.14.0
+            tag: 11.13.4
             pullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -41,27 +41,27 @@ 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
@@ -156,12 +156,9 @@ directus:
 cloudflared-directus:
   name: cloudflared-directus
   existingSecretName: directus-cloudflared-secret
-postgres-18-cluster:
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -173,30 +170,30 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: directus-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: directus-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/directus/directus-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/directus/directus-postgresql-17-cluster
         index: 1
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
-        endpointCredentials: directus-postgresql-18-cluster-backup-secret-garage
+        endpointCredentials: directus-postgresql-17-cluster-backup-secret-garage
         endpointCredentialsIncludeRegion: true
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/directus/directus-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: directus-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: directus-postgresql-17-cluster-backup-secret-garage
       #   retentionPolicy: "30d"
       #   data:
       #     compression: bzip2
@@ -204,7 +201,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -214,6 +210,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: false
-      #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote

clusters/cl01tl/helm/elastic-operator/Chart.yaml

@@ -18,4 +18,4 @@ dependencies:
     version: 3.2.0
     repository: https://helm.elastic.co
 icon: https://helm.elastic.co/icons/eck.png
-appVersion: v3.2.0
+appVersion: 1.26.0

clusters/cl01tl/helm/element-web/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: element-web
   repository: https://ananace.gitlab.io/charts
-  version: 1.4.26
+  version: 1.4.24
 - name: cloudflared
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.23.2
+  version: 1.23.0
-digest: sha256:f9196cbede894c6da6ecedd9ae05d3f1fd0e20304eca8ca38c18334a923b2235
+digest: sha256:05aa032adca6d808215d6dcd5d7e38b821a740a53868238f79adaa606444b3ae
-generated: "2025-12-07T02:54:29.895481505Z"
+generated: "2025-11-30T21:05:30.356497-06:00"

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

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

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

@@ -2,7 +2,7 @@ element-web:
   replicaCount: 1
   image:
     repository: vectorim/element-web
-    tag: v1.12.6
+    tag: v1.12.4
     pullPolicy: IfNotPresent
   defaultServer:
     url: https://matrix.alexlebens.dev

clusters/cl01tl/helm/ephemera/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:b08b2d3923734ba8844754727803a4b4e1de2ad418c3f755ccd64927266c1b5c
+digest: sha256:9900009eb6415344d8c5387371a0052259092d92f34c21774f6a6abe9f11f43e
-generated: "2025-12-05T17:04:04.30013278Z"
+generated: "2025-11-30T21:05:32.524168-06:00"

clusters/cl01tl/helm/ephemera/Chart.yaml

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

clusters/cl01tl/helm/ephemera/values.yaml

@@ -34,7 +34,7 @@ ephemera:
         flaresolverr:
           image:
             repository: ghcr.io/flaresolverr/flaresolverr
-            tag: v3.4.6
+            tag: v3.4.5
             pullPolicy: IfNotPresent
           env:
             - name: LOG_LEVEL

clusters/cl01tl/helm/eraser/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: eraser
   repository: https://eraser-dev.github.io/eraser/charts
-  version: 1.4.1
+  version: 1.3.1
-digest: sha256:da828de684b0cd82e99994586f3db4f55c43c01607c4d8d0e70e204c7bbbbf5b
+digest: sha256:17b561a00acc809810dccd226e7b6d757db39b34a6095dee879da761098125f9
-generated: "2025-12-03T22:53:20.200917773Z"
+generated: "2025-12-01T20:25:36.491841-06:00"

clusters/cl01tl/helm/eraser/Chart.yaml

@@ -14,7 +14,7 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: eraser
-    version: 1.4.1
+    version: v1.3.1
     repository: https://eraser-dev.github.io/eraser/charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/kubernetes.png
-appVersion: v1.4.1
+appVersion: v1.3.1

clusters/cl01tl/helm/external-dns/Chart.yaml

@@ -19,4 +19,4 @@ dependencies:
     version: 1.19.0
     repository: https://kubernetes-sigs.github.io/external-dns/
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/kubernetes.png
-appVersion: v0.20.0
+appVersion: 1.16.1

clusters/cl01tl/helm/external-secrets/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: external-secrets
   repository: https://charts.external-secrets.io
-  version: 1.1.1
+  version: 1.1.0
-digest: sha256:d346563864c95c4ca3fe5f04f6b292e417069d171f5866b5af0fe84277481493
+digest: sha256:543c98c4f4014f91b05c823444d87990dcdcd9710a0e5ccd953c5dc4e70006ee
-generated: "2025-12-06T18:01:23.564488208Z"
+generated: "2025-12-01T20:25:40.642486-06:00"

clusters/cl01tl/helm/external-secrets/Chart.yaml

@@ -12,7 +12,7 @@ sources:
   - https://github.com/external-secrets/external-secrets/tree/main/deploy/charts/external-secrets
 dependencies:
   - name: external-secrets
-    version: 1.1.1
+    version: 1.1.0
     repository: https://charts.external-secrets.io
 icon: https://avatars.githubusercontent.com/u/68335991?s=48&v=4
-appVersion: v1.1.1
+appVersion: 0.17.0

clusters/cl01tl/helm/freshrss/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
 - name: cloudflared
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.23.2
+  version: 1.23.0
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:dc8829a1f2cea88033bfda5d412dee8124154e26bfbe9e1bd67b8bb351ad7904
+digest: sha256:1c1355c247383bb5aef029eaadaf0c6bbcc23c0e42868178c1ea9a9ab21cc704
-generated: "2025-12-11T17:07:50.35548-06:00"
+generated: "2025-11-30T21:05:34.030606-06:00"

clusters/cl01tl/helm/freshrss/Chart.yaml

@@ -20,14 +20,14 @@ dependencies:
   - name: app-template
     alias: freshrss
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.23.0
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.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/helm/freshrss/templates/external-secret.yaml

@@ -155,10 +155,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: freshrss-postgresql-18-cluster-backup-secret
+  name: freshrss-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: freshrss-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: freshrss-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -185,10 +185,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: freshrss-postgresql-18-cluster-backup-secret-garage
+  name: freshrss-postgresql-17-cluster-backup-secret-garage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: freshrss-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: freshrss-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/freshrss/values.yaml

@@ -11,7 +11,7 @@ freshrss:
             runAsUser: 0
           image:
             repository: alpine
-            tag: 3.23.0
+            tag: 3.22.2
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -35,7 +35,7 @@ freshrss:
             runAsUser: 0
           image:
             repository: alpine
-            tag: 3.23.0
+            tag: 3.22.2
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -59,7 +59,7 @@ freshrss:
             runAsUser: 0
           image:
             repository: alpine
-            tag: 3.23.0
+            tag: 3.22.2
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -98,22 +98,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: |
@@ -193,12 +193,9 @@ freshrss:
               readOnly: false
 cloudflared:
   existingSecretName: freshrss-cloudflared-secret
-postgres-18-cluster:
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -210,30 +207,30 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: freshrss-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-17-cluster
         index: 1
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
-        endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage
+        endpointCredentials: freshrss-postgresql-17-cluster-backup-secret-garage
         endpointCredentialsIncludeRegion: true
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: freshrss-postgresql-17-cluster-backup-secret-garage
       #   retentionPolicy: "30d"
       #   data:
       #     compression: bzip2
@@ -241,7 +238,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -251,6 +247,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: false
-      #   immediate: true
       #   schedule: "0 2 4 * * SAT"
       #   backupName: garage-remote

clusters/cl01tl/helm/garage/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
-digest: sha256:36e920ce6efee3b33b40641652f814c888ae3c50272895ef286fb8236a010924
+digest: sha256:7977708d7681e8d5cbc066bcda4241144b0c8b5b590be89a394740df167c90da
-generated: "2025-12-05T17:04:29.153093714Z"
+generated: "2025-12-01T20:25:44.910074-06:00"

clusters/cl01tl/helm/garage/Chart.yaml

@@ -17,6 +17,6 @@ dependencies:
   - name: app-template
     alias: garage
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/kubernetes.png
 appVersion: v2.1.0

clusters/cl01tl/helm/gatus/Chart.lock

@@ -4,6 +4,6 @@ dependencies:
   version: 1.4.4
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:11d46f37e9f98a5562239e1b827a4caccc0ca14dc738681465e27ef5c5edd6d0
+digest: sha256:9424c70bc46b5582f19b695196586546c69862ccca8950b906d5532cf03c7792
-generated: "2025-12-11T17:23:01.072262-06:00"
+generated: "2025-12-01T19:55:44.159963-06:00"

clusters/cl01tl/helm/gatus/Chart.yaml

@@ -21,8 +21,8 @@ dependencies:
     repository: https://twin.github.io/helm-charts
     version: 1.4.4
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/gatus.png
-appVersion: v5.33.0
+appVersion: v5.12.0

clusters/cl01tl/helm/gatus/templates/external-secret.yaml

@@ -54,10 +54,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: gatus-postgresql-18-cluster-backup-secret
+  name: gatus-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: gatus-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: gatus-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -84,10 +84,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: gatus-postgresql-18-cluster-backup-secret-garage
+  name: gatus-postgresql-17-cluster-backup-secret-garage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: gatus-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: gatus-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/gatus/values.yaml

@@ -36,27 +36,27 @@ gatus:
     POSTGRES_USER:
       valueFrom:
         secretKeyRef:
-          name: gatus-postgresql-18-cluster-app
+          name: gatus-postgresql-17-cluster-app
           key: username
     POSTGRES_PASSWORD:
       valueFrom:
         secretKeyRef:
-          name: gatus-postgresql-18-cluster-app
+          name: gatus-postgresql-17-cluster-app
           key: password
     POSTGRES_HOST:
       valueFrom:
         secretKeyRef:
-          name: gatus-postgresql-18-cluster-app
+          name: gatus-postgresql-17-cluster-app
           key: host
     POSTGRES_PORT:
       valueFrom:
         secretKeyRef:
-          name: gatus-postgresql-18-cluster-app
+          name: gatus-postgresql-17-cluster-app
           key: port
     POSTGRES_DB:
       valueFrom:
         secretKeyRef:
-          name: gatus-postgresql-18-cluster-app
+          name: gatus-postgresql-17-cluster-app
           key: dbname
   resources:
     requests:
@@ -125,9 +125,6 @@ gatus:
       - name: overseerr
         url: https://overseerr.alexlebens.net
         <<: *defaults
-      - name: seerr
-        url: https://seerr.alexlebens.net
-        <<: *defaults
       - name: yamtrack
         url: https://yamtrack.alexlebens.net
         <<: *defaults
@@ -143,9 +140,6 @@ gatus:
       - name: audiobookshelf
         url: https://audiobookshelf.alexlebens.net
         <<: *defaults
-      - name: booklore
-        url: https://booklore.alexlebens.net
-        <<: *defaults
       - name: home-assistant
         url: https://home-assistant.alexlebens.net
         <<: *defaults
@@ -182,11 +176,6 @@ gatus:
       - name: n8n
         url: https://n8n.alexlebens.net
         <<: *defaults
-      - name: kronic
-        url: https://kronic.alexlebens.net
-        <<: *defaults
-        conditions:
-          - "[STATUS] == 401"
       - name: omni-tools
         url: https://omni-tools.alexlebens.net
         <<: *defaults
@@ -256,9 +245,6 @@ gatus:
       - name: ceph
         url: https://ceph.alexlebens.net
         <<: *defaults
-      - name: garage
-        url: https://garage-webui.alexlebens.net
-        <<: *defaults
       - name: pgadmin
         url: https://pgadmin.alexlebens.net
         <<: *defaults
@@ -268,29 +254,6 @@ gatus:
       - name: vault
         url: https://vault.alexlebens.net
         <<: *defaults
-      - name: backrest
-        url: https://backrest.alexlebens.net
-        <<: *defaults
-      - name: qui
-        url: https://qui.alexlebens.net
-        <<: *defaults
-      - name: qbittorrent
-        url: https://qbittorrent.alexlebens.net
-        <<: *defaults
-      - name: prowlarr
-        url: https://prowlarr.alexlebens.net
-        <<: *defaults
-      - name: huntarr
-        url: https://huntarr.alexlebens.net
-        <<: *defaults
-      - name: bazarr
-        url: https://bazarr.alexlebens.net
-        <<: *defaults
-        conditions:
-          - "[STATUS] == 401"
-      - name: tdarr
-        url: https://tdarr.alexlebens.net
-        <<: *defaults
       - name: sonarr
         url: https://sonarr.alexlebens.net
         <<: *defaults
@@ -321,11 +284,25 @@ gatus:
       - name: slskd
         url: https://slskd.alexlebens.net
         <<: *defaults
-      - name: ephemera
+      - name: qui
-        url: https://ephemera.alexlebens.net
+        url: https://qui.alexlebens.net
         <<: *defaults
-      - name: listenarr
+      - name: qbittorrent
-        url: https://listenarr.alexlebens.net
+        url: https://qbittorrent.alexlebens.net
+        <<: *defaults
+      - name: prowlarr
+        url: https://prowlarr.alexlebens.net
+        <<: *defaults
+      - name: bazarr
+        url: https://bazarr.alexlebens.net
+        <<: *defaults
+        conditions:
+          - "[STATUS] == 401"
+      - name: huntarr
+        url: https://huntarr.alexlebens.net
+        <<: *defaults
+      - name: tdarr
+        url: https://tdarr.alexlebens.net
         <<: *defaults
       - name: www
         url: https://www.alexlebens.dev
@@ -370,20 +347,27 @@ gatus:
         url: https://codeserver.alexlebens.dev
         <<: *defaults
         group: external
-      - name: authentik
-        url: https://auth.alexlebens.dev
-        <<: *defaults
-        group: external
       - name: public homepage
         url: https://home.alexlebens.dev
         <<: *defaults
         group: external
-postgres-18-cluster:
+      - name: discord
+        group: public
+        url: https://discord.com/app
+        conditions:
+          - "[STATUS] == 200"
+          - "[RESPONSE_TIME] < 400"
+        interval: 10s
+      - name: reddit
+        group: public
+        url: https://reddit.com
+        conditions:
+          - "[STATUS] == 200"
+          - "[RESPONSE_TIME] < 400"
+        interval: 10s
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -395,19 +379,19 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: gatus-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: gatus-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gatus/gatus-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gatus/gatus-postgresql-17-cluster
         index: 2
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
         endpointCredentials: gatus-postgresql-17-cluster-backup-secret-garage
@@ -415,10 +399,10 @@ postgres-18-cluster:
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: gatus-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: gatus-postgresql-17-cluster-backup-secret-garage
       #   retentionPolicy: "30d"
       #   data:
       #     compression: bzip2
@@ -426,7 +410,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -436,6 +419,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: false
-      #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote

clusters/cl01tl/helm/generic-device-plugin/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: generic-device-plugin
   repository: https://gitea.alexlebens.dev/api/packages/alexlebens/helm
-  version: 0.20.5
+  version: 0.20.1
-digest: sha256:329b2d00301ab1467a8654dd92febfd7078db121c00c0960548010c01dee66b6
+digest: sha256:4579605b405a55d66fd5deae5c12259afe98f5ad93843bf4e75fe6f4d45929de
-generated: "2025-12-08T03:02:06.697075532Z"
+generated: "2025-12-01T20:25:48.389977-06:00"

clusters/cl01tl/helm/generic-device-plugin/Chart.yaml

@@ -15,6 +15,6 @@ maintainers:
 dependencies:
   - name: generic-device-plugin
     repository: https://gitea.alexlebens.dev/api/packages/alexlebens/helm
-    version: 0.20.5
+    version: 0.20.1
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/kubernetes.png
 appVersion: 1.0.0

clusters/cl01tl/helm/gitea/Chart.lock

@@ -7,15 +7,15 @@ dependencies:
   version: 0.2.1
 - name: app-template
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.5.0
+  version: 4.4.0
 - name: meilisearch
   repository: https://meilisearch.github.io/meilisearch-kubernetes
-  version: 0.17.2
+  version: 0.17.1
 - name: cloudflared
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.23.2
+  version: 1.23.0
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:ecb6e0283b564f37b5d60bb64860b71c3b68acc2835364c0488fd7a9e932b941
+digest: sha256:6e72cd4abc36e238a5129d0ee471bc296435f8ff1c8be7f3132fc33193a39f23
-generated: "2025-12-11T17:38:49.087683-06:00"
+generated: "2025-12-01T20:25:50.496342-06:00"

clusters/cl01tl/helm/gitea/Chart.yaml

@@ -34,17 +34,17 @@ dependencies:
   - name: app-template
     alias: backup
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.5.0
+    version: 4.4.0
   - name: meilisearch
-    version: 0.17.2
+    version: 0.17.1
     repository: https://meilisearch.github.io/meilisearch-kubernetes
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.23.2
+    version: 1.23.0
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://raw.githubusercontent.com/walkxcode/dashboard-icons/main/png/gitea.png
-appVersion: 1.25.2
+appVersion: 1.23.7

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

@@ -254,10 +254,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: gitea-postgresql-18-cluster-backup-secret
+  name: gitea-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: gitea-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: gitea-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -284,10 +284,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: gitea-postgresql-18-cluster-backup-secret-garage
+  name: gitea-postgresql-17-cluster-backup-secret-garage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: gitea-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: gitea-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/gitea/templates/redis-replication.yaml

@@ -13,7 +13,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.0.3
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -29,7 +29,7 @@ spec:
             storage: 10Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.48.0
 
 ---
 apiVersion: redis.redis.opstreelabs.in/v1beta2
@@ -47,7 +47,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.0.3
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -63,4 +63,4 @@ spec:
             storage: 1Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.48.0

clusters/cl01tl/helm/gitea/templates/redis-sentinel.yaml

@@ -1,23 +0,0 @@
-apiVersion: redis.redis.opstreelabs.in/v1beta2
-kind: RedisSentinel
-metadata:
-  name: redis-sentinel-gitea
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: redis-sentinel-gitea
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  clusterSize: 3
-  podSecurityContext:
-    runAsUser: 1000
-    fsGroup: 1000
-  redisSentinelConfig:
-    redisReplicationName: redis-replication-gitea
-  kubernetesConfig:
-    image: quay.io/opstree/redis-sentinel:v8.4.0
-    imagePullPolicy: IfNotPresent
-    resources:
-      requests:
-        cpu: 10m
-        memory: 128Mi

clusters/cl01tl/helm/gitea/templates/service-monitor.yaml

@@ -12,6 +12,8 @@ spec:
     matchLabels:
       app.kubernetes.io/name: gitea
       app.kubernetes.io/instance: {{ .Release.Name }}
+    matchExpressions:
+      - { key: app.kubernetes.io/controller, operator: NotIn, values: [backup] }
   endpoints:
     - port: http
 

clusters/cl01tl/helm/gitea/values.yaml

@@ -108,22 +108,22 @@ gitea:
       - name: GITEA__DATABASE__HOST
         valueFrom:
           secretKeyRef:
-            name: gitea-postgresql-18-cluster-app
+            name: gitea-postgresql-17-cluster-app
             key: host
       - name: GITEA__DATABASE__NAME
         valueFrom:
           secretKeyRef:
-            name: gitea-postgresql-18-cluster-app
+            name: gitea-postgresql-17-cluster-app
             key: dbname
       - name: GITEA__DATABASE__USER
         valueFrom:
           secretKeyRef:
-            name: gitea-postgresql-18-cluster-app
+            name: gitea-postgresql-17-cluster-app
             key: user
       - name: GITEA__DATABASE__PASSWD
         valueFrom:
           secretKeyRef:
-            name: gitea-postgresql-18-cluster-app
+            name: gitea-postgresql-17-cluster-app
             key: password
       - name: GITEA__INDEXER__ISSUE_INDEXER_CONN_STR
         valueFrom:
@@ -174,9 +174,6 @@ gitea-actions:
 backup:
   global:
     fullnameOverride: gitea-backup
-    labels:
-      app.kubernetes.io/instance: gitea-backup
-      app.kubernetes.io/name: gitea-backup
   controllers:
     backup:
       type: cronjob
@@ -194,9 +191,6 @@ backup:
         name: gitea-backup
       pod:
         automountServiceAccountToken: true
-        labels:
-          app.kubernetes.io/instance: gitea-backup
-          app.kubernetes.io/name: gitea-backup
       initContainers:
         backup:
           image:
@@ -218,7 +212,7 @@ backup:
         s3-backup:
           image:
             repository: d3fk/s3cmd
-            tag: latest@sha256:a4ef406e37628ee56e608b1567aeb0345e51142f56741b715322111be3b6ebcc
+            tag: latest@sha256:7bdbd33bb3d044884598898b9e9b383385759fbd6ebf52888700bd9b0e0fab91
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -242,7 +236,7 @@ backup:
         s3-prune:
           image:
             repository: d3fk/s3cmd
-            tag: latest@sha256:a4ef406e37628ee56e608b1567aeb0345e51142f56741b715322111be3b6ebcc
+            tag: latest@sha256:7bdbd33bb3d044884598898b9e9b383385759fbd6ebf52888700bd9b0e0fab91
             pullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -322,12 +316,9 @@ meilisearch:
     enabled: true
 cloudflared:
   existingSecretName: gitea-cloudflared-secret
-postgres-18-cluster:
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -343,30 +334,30 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: gitea-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: gitea-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-17-cluster
         index: 1
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
-        endpointCredentials: gitea-postgresql-18-cluster-backup-secret-garage
+        endpointCredentials: gitea-postgresql-17-cluster-backup-secret-garage
         endpointCredentialsIncludeRegion: true
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: gitea-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: gitea-postgresql-17-cluster-backup-secret-garage
       #   retentionPolicy: "30d"
       #   data:
       #     compression: bzip2
@@ -374,7 +365,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -384,6 +374,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: false
-      #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote

clusters/cl01tl/helm/grafana-operator/Chart.lock

@@ -4,6 +4,6 @@ dependencies:
   version: v5.20.0
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
+  version: 6.16.0
-digest: sha256:9640766b4a15b50a759edbc8a2aad816f9240be72bf06364acb387464245d51a
+digest: sha256:d70b284b771af610116564e5f47d72415ab0d3520ecb552159ee8dc8acd2ab46
-generated: "2025-12-11T19:19:12.375716-06:00"
+generated: "2025-12-01T19:55:46.485062-06:00"

clusters/cl01tl/helm/grafana-operator/Chart.yaml

@@ -20,8 +20,8 @@ dependencies:
     version: v5.20.0
     repository: https://grafana.github.io/helm-charts
   - name: postgres-cluster
-    alias: postgres-18-cluster
+    alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.16.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/grafana.png
-appVersion: v5.20.0
+appVersion: v5.18.0

clusters/cl01tl/helm/grafana-operator/templates/external-secret.yaml

@@ -61,10 +61,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: grafana-operator-postgresql-18-cluster-backup-secret
+  name: grafana-operator-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-operator-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/name: grafana-operator-postgresql-17-cluster-backup-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -91,10 +91,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: grafana-operator-postgresql-18-cluster-backup-secret-garage
+  name: grafana-operator-postgresql-17-cluster-backup-secret-garage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-operator-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/name: grafana-operator-postgresql-17-cluster-backup-secret-garage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:

clusters/cl01tl/helm/grafana-operator/templates/grafana.yaml

@@ -85,25 +85,25 @@ spec:
                 - name: DB_HOST
                   valueFrom:
                     secretKeyRef:
-                      name: grafana-operator-postgresql-18-cluster-app
+                      name: grafana-operator-postgresql-17-cluster-app
                       key: host
                 - name: DB_DATABASE
                   valueFrom:
                     secretKeyRef:
-                      name: grafana-operator-postgresql-18-cluster-app
+                      name: grafana-operator-postgresql-17-cluster-app
                       key: dbname
                 - name: DB_PORT
                   valueFrom:
                     secretKeyRef:
-                      name: grafana-operator-postgresql-18-cluster-app
+                      name: grafana-operator-postgresql-17-cluster-app
                       key: port
                 - name: DB_USER
                   valueFrom:
                     secretKeyRef:
-                      name: grafana-operator-postgresql-18-cluster-app
+                      name: grafana-operator-postgresql-17-cluster-app
                       key: user
                 - name: DB_PASSWORD
                   valueFrom:
                     secretKeyRef:
-                      name: grafana-operator-postgresql-18-cluster-app
+                      name: grafana-operator-postgresql-17-cluster-app
                       key: password

clusters/cl01tl/helm/grafana-operator/templates/redis-replication.yaml

@@ -13,7 +13,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.0.3
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -29,7 +29,7 @@ spec:
             storage: 1Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.48.0
 
 ---
 apiVersion: redis.redis.opstreelabs.in/v1beta2
@@ -47,7 +47,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: quay.io/opstree/redis:v8.0.3
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -63,4 +63,4 @@ spec:
             storage: 1Gi
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: quay.io/opstree/redis-exporter:v1.48.0

clusters/cl01tl/helm/grafana-operator/values.yaml

@@ -12,12 +12,9 @@ grafana-operator:
     enabled: true
   dashboard:
     enabled: false
-postgres-18-cluster:
+postgres-17-cluster:
   mode: recovery
   cluster:
-    image:
-      repository: ghcr.io/cloudnative-pg/postgresql
-      tag: 18.1-standard-trixie
     storage:
       storageClass: local-path
     walStorage:
@@ -29,30 +26,30 @@ postgres-18-cluster:
   recovery:
     method: objectStore
     objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster
+      destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
-      endpointCredentials: grafana-operator-postgresql-18-cluster-backup-secret-garage
+      endpointCredentials: grafana-operator-postgresql-17-cluster-backup-secret-garage
   backup:
     objectStore:
       - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster
-        index: 1
+        index: 2
         retentionPolicy: "30d"
         isWALArchiver: false
       - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster
+        destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster
         index: 1
         endpointURL: http://garage-main.garage:3900
-        endpointCredentials: grafana-operator-postgresql-18-cluster-backup-secret-garage
+        endpointCredentials: grafana-operator-postgresql-17-cluster-backup-secret-garage
         endpointCredentialsIncludeRegion: true
         retentionPolicy: "3d"
         isWALArchiver: true
       # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster
+      #   destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster
       #   index: 1
       #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: grafana-operator-postgresql-18-cluster-backup-secret-garage
+      #   endpointCredentials: grafana-operator-postgresql-17-cluster-backup-secret-garage
       #   retentionPolicy: "30d"
       #   data:
       #     compression: bzip2
@@ -60,7 +57,6 @@ postgres-18-cluster:
     scheduledBackups:
       - name: daily-backup
         suspend: false
-        immediate: true
         schedule: "0 0 0 * * *"
         backupName: external
       - name: live-backup
@@ -70,6 +66,5 @@ postgres-18-cluster:
         backupName: garage-local
       # - name: weekly-backup
       #   suspend: false
-      #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote