Merge pull request 'feat: change folder path to just the collections' (#5772) from tmp/foldergram-3 into main

Reviewed-on: #5772

.gitea/workflows/render-manifests.yaml

@@ -283,7 +283,7 @@ jobs:
 
               echo ">> Formating rendered template ..."
               local TEMPLATE
-              TEMPLATE=$(helm template "${CHART_NAME}" ./ --namespace "${NAMESPACE}" --include-crds --dry-run=server --api-versions "gateway.networking.k8s.io/v1/HTTPRoute")
+              TEMPLATE=$(helm template "${CHART_NAME}" ./ --namespace "${NAMESPACE}" --include-crds --dry-run=server --api-versions "gateway.networking.k8s.io/v1/HTTPRoute,monitoring.coreos.com/v1")
 
               # Format and split rendered template
               echo "${TEMPLATE}" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"${OUTPUT_FOLDER}"'" + .kind + "-" + .metadata.name + ".yaml"'
@@ -314,7 +314,7 @@ jobs:
           for DIR in ${RENDER_DIR}; do
             echo "${DIR}"
 
-          done | xargs -P 4 -I {} bash -c 'OUT=$(render_chart "$@" 2>&1); printf "%s\n" "$OUT"' _ {}
+          done | xargs -P 5 -I {} bash -c 'OUT=$(render_chart "$@" 2>&1); printf "%s\n" "$OUT"' _ {}
 
           echo ""
           echo "----"

.gitea/workflows/renovate.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   renovate:
     runs-on: ubuntu-latest
-    container: ghcr.io/renovatebot/renovate:43.110.3@sha256:e5f61c5feb9fe3e5887135337edf178a99e01f5c1438f7da99f58930cfb7c51d
+    container: ghcr.io/renovatebot/renovate:43.110.4@sha256:7ad99abc53b30d3f6e34df88b3e2b2b75436bba9b290e90d367356526034496f
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

clusters/cl01tl/helm/argocd/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: argo-cd
   repository: https://argoproj.github.io/argo-helm
-  version: 9.4.17
+  version: 9.5.0
-digest: sha256:17752dbf03861cf70ee31c9a17373a5175656a2edd00ba5fcd3988a195147da8
+digest: sha256:69daada0822f796cd49eeda2d9e39dd5c0c42bb61b6898af68123c8c49f25fa1
-generated: "2026-03-28T01:51:34.832601868Z"
+generated: "2026-04-08T22:05:49.003208408Z"

clusters/cl01tl/helm/argocd/Chart.yaml

@@ -13,7 +13,7 @@ maintainers:
   - name: alexlebens
 dependencies:
   - name: argo-cd
-    version: 9.4.17
+    version: 9.5.0
     repository: https://argoproj.github.io/argo-helm
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/argo-cd.png
 # renovate: datasource=github-releases depName=argoproj/argo-cd

clusters/cl01tl/helm/blocky/values.yaml

@@ -109,7 +109,6 @@ blocky:
               bazarr                          IN      CNAME   traefik-cl01tl
               ceph                            IN      CNAME   traefik-cl01tl
               dawarich                        IN      CNAME   traefik-cl01tl
-              dependency-track                IN      CNAME   traefik-cl01tl
               directus                        IN      CNAME   traefik-cl01tl
               excalidraw                      IN      CNAME   traefik-cl01tl
               feishin                         IN      CNAME   traefik-cl01tl

clusters/cl01tl/helm/dependency-track/Chart.lock

@@ -1,9 +0,0 @@
-dependencies:
-- name: dependency-track
-  repository: https://dependencytrack.github.io/helm-charts
-  version: 0.44.0
-- name: postgres-cluster
-  repository: oci://harbor.alexlebens.net/helm-charts
-  version: 7.11.2
-digest: sha256:6ea7e8066cce675a02ce76393ee2b0e23300d2f5c72ae64946ae667fc12fde1f
-generated: "2026-04-05T17:32:11.221935-05:00"

clusters/cl01tl/helm/dependency-track/Chart.yaml

@@ -1,27 +0,0 @@
-apiVersion: v2
-name: dependency-track
-version: 1.0.0
-description: Dependency Track
-keywords:
-  - dependency-track
-  - vulnerability-scanner
-home: https://docs.alexlebens.dev/applications/dependency-track/
-sources:
-  - https://github.com/DependencyTrack/dependency-track
-  - https://hub.docker.com/r/dependencytrack/apiserver
-  - https://hub.docker.com/r/dependencytrack/frontend
-  - https://github.com/DependencyTrack/helm-charts/tree/main/charts/dependency-track
-  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
-maintainers:
-  - name: alexlebens
-dependencies:
-  - name: dependency-track
-    version: 0.44.0
-    repository: https://dependencytrack.github.io/helm-charts
-  - name: postgres-cluster
-    alias: postgres-18-cluster
-    version: 7.11.2
-    repository: oci://harbor.alexlebens.net/helm-charts
-icon: https://avatars.githubusercontent.com/u/40258585
-# renovate: datasource=github-releases depName=DependencyTrack/dependency-track
-appVersion: 4.14.1

clusters/cl01tl/helm/dependency-track/templates/external-secret.yaml

@@ -1,42 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: dependency-track-key-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: dependency-track-key-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: secret.key
-      remoteRef:
-        key: /cl01tl/dependency-track/key
-        property: key
-
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: dependency-track-oidc-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: dependency-track-oidc-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: client
-      remoteRef:
-        key: /authentik/oidc/dependency-track
-        property: client
-    - secretKey: secret
-      remoteRef:
-        key: /authentik/oidc/dependency-track
-        property: secret

clusters/cl01tl/helm/dependency-track/values.yaml

@@ -1,114 +0,0 @@
-dependency-track:
-  common:
-    secretKey:
-      createSecret: false
-      existingSecretName: dependency-track-key-secret
-  apiServer:
-    image:
-      repository: dependencytrack/apiserver
-      tag: 4.14.1@sha256:2d8813e1ba4ada4aa23087d908c1b5a3ffce39261ead5555c397a1d67c7cbe9d
-    resources:
-      requests:
-        cpu: 100m
-        memory: 100Mi
-      limits:
-        memory: null
-    persistentVolume:
-      enabled: true
-      className: ceph-block
-      size: 5Gi
-    extraEnv:
-      - name: ALPINE_DATABASE_MODE
-        value: external
-      - name: ALPINE_DATABASE_DRIVER
-        value: org.postgresql.Driver
-      - name: ALPINE_DATABASE_URL
-        valueFrom:
-          secretKeyRef:
-            name: dependency-track-postgresql-18-cluster-app
-            key: jdbc-uri
-      - name: ALPINE_DATABASE_USERNAME
-        valueFrom:
-          secretKeyRef:
-            name: dependency-track-postgresql-18-cluster-app
-            key: user
-      - name: ALPINE_DATABASE_PASSWORD
-        valueFrom:
-          secretKeyRef:
-            name: dependency-track-postgresql-18-cluster-app
-            key: password
-      - name: ALPINE_OIDC_ENABLED
-        value: "true"
-      - name: ALPINE_OIDC_CLIENT_ID
-        valueFrom:
-          secretKeyRef:
-            name: dependency-track-oidc-secret
-            key: client
-      - name: ALPINE_OIDC_ISSUER
-        value: https://authentik.alexlebens.net/application/o/dependency-track/
-      - name: ALPINE_OIDC_USERNAME_CLAIM
-        value: preferred_username
-      - name: ALPINE_OIDC_TEAMS_CLAIM
-        value: groups
-      - name: ALPINE_OIDC_USER_PROVISIONING
-        value: "true"
-      - name: ALPINE_OIDC_TEAM_SYNCHRONIZATION
-        value: "true"
-      - name: ALPINE_CORS_ENABLED
-        value: "false"
-      - name: ALPINE_CORS_ALLOW_ORIGIN
-        value: dependency-track.alexlebens.net dependency-track.dependency-track
-    serviceMonitor:
-      enabled: true
-      namespace: dependency-track
-  frontend:
-    image:
-      repository: dependencytrack/frontend
-      tag: 4.14.1@sha256:8217737050b26ea69a6ddd6fe2cb419531a0bae0b903a87a04077a2415fc9f35
-    resources:
-      requests:
-        cpu: 10m
-        memory: 60Mi
-      limits:
-        memory: null
-    extraEnv:
-      - name: OIDC_ISSUER
-        value: https://authentik.alexlebens.net/application/o/dependency-track/
-      - name: OIDC_FLOW
-        value: explicit
-      - name: OIDC_CLIENT_ID
-        valueFrom:
-          secretKeyRef:
-            name: dependency-track-oidc-secret
-            key: client
-      - name: OIDC_LOGIN_BUTTON_TEXT
-        value: Authentik
-    apiBaseUrl: dependency-track-api-server.dependency-track
-  httpRoute:
-    enabled: true
-    hostnames:
-      - dependency-track.alexlebens.net
-    parentRefs:
-      - group: gateway.networking.k8s.io
-        kind: Gateway
-        name: traefik-gateway
-        namespace: traefik
-postgres-18-cluster:
-  mode: standalone
-  recovery:
-    method: objectStore
-    objectStore:
-      index: 1
-  backup:
-    objectStore:
-      - name: garage-local
-        index: 1
-        destinationBucket: postgres-backups
-        externalSecretCredentialPath: /garage/home-infra/postgres-backups
-        isWALArchiver: true
-    scheduledBackups:
-      - name: live-backup
-        suspend: false
-        immediate: true
-        schedule: "0 10 14 * * *"
-        backupName: garage-local

clusters/cl01tl/helm/eraser/Chart.lock

@@ -2,5 +2,8 @@ dependencies:
 - name: eraser
   repository: https://eraser-dev.github.io/eraser/charts
   version: 1.4.1
-digest: sha256:da828de684b0cd82e99994586f3db4f55c43c01607c4d8d0e70e204c7bbbbf5b
+- name: app-template
-generated: "2025-12-03T22:53:20.200917773Z"
+  repository: https://bjw-s-labs.github.io/helm-charts/
+  version: 4.6.2
+digest: sha256:8414813d3d9d195b16ef7ebf814f7095a16413f4b0e579fcb37738000624f68c
+generated: "2026-04-08T21:39:05.689756-05:00"

clusters/cl01tl/helm/eraser/Chart.yaml

@@ -9,13 +9,19 @@ home: https://docs.alexlebens.dev/applications/eraser/
 sources:
   - https://github.com/eraser-dev/eraser
   - https://github.com/eraser-dev/eraser/pkgs/container/eraser-manager
+  - https://github.com/open-telemetry/opentelemetry-collector-releases/pkgs/container/opentelemetry-collector-releases%2Fopentelemetry-collector
   - https://github.com/eraser-dev/eraser/tree/main/charts/eraser
+  - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
 maintainers:
   - name: alexlebens
 dependencies:
   - name: eraser
     version: 1.4.1
     repository: https://eraser-dev.github.io/eraser/charts
+  - name: app-template
+    alias: eraser-metrics
+    repository: https://bjw-s-labs.github.io/helm-charts/
+    version: 4.6.2
 icon: https://raw.githubusercontent.com/eraser-dev/eraser/refs/heads/main/images/eraser-logo-color-1c.png
 # renovate: datasource=github-releases depName=eraser-dev/eraser
 appVersion: v1.4.1

clusters/cl01tl/helm/eraser/values.yaml

@@ -35,3 +35,85 @@ eraser:
       requests:
         cpu: 1m
         memory: 20Mi
+eraser-metrics:
+  global:
+    nameOverride: eraser-metrics
+    fullnameOverride: eraser-metrics
+  controllers:
+    main:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      containers:
+        main:
+          image:
+            repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector
+            tag: 0.149.0@sha256:dd56aed607fd02f8ac01dddb27a859c0c2cc750539abce927803778fafc736ae
+          command:
+            - /otelcol
+            - --config=/conf/otel-collector-config.yaml
+          resources:
+            requests:
+              cpu: 10m
+              memory: 20Mi
+  configMaps:
+    config:
+      enabled: true
+      forceRename: eraser-config
+      data:
+        otel-collector-config.yaml: |
+          receivers:
+            otlp:
+              protocols:
+                http:
+
+          exporters:
+            prometheus:
+              endpoint: "0.0.0.0:8889"
+              send_timestamps: true
+              metric_expiration: 180m
+
+          service:
+            telemetry:
+              logs:
+                encoding: json
+            pipelines:
+              metrics:
+                receivers:
+                  - otlp
+                exporters:
+                  - prometheus
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 4318
+          targetPort: 4318
+        metrics:
+          port: 8889
+          targetPort: 8889
+  serviceMonitor:
+    main:
+      selector:
+        matchLabels:
+          app.kubernetes.io/name: eraser-metrics
+          app.kubernetes.io/instance: eraser-metrics
+      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+      endpoints:
+        - port: metrics
+          interval: 30s
+          scrapeTimeout: 15s
+          path: /metrics
+  persistence:
+    config:
+      enabled: true
+      type: configMap
+      name: eraser-config
+      advancedMounts:
+        main:
+          main:
+            - path: /conf/otel-collector-config.yaml
+              readOnly: true
+              mountPropagation: None
+              subPath: otel-collector-config.yaml

clusters/cl01tl/helm/foldergram/templates/persistent-volume.yaml

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

clusters/cl01tl/helm/foldergram/values.yaml

@@ -58,7 +58,7 @@ foldergram:
       forceRename: foldergram-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
-      size: 10Gi
+      size: 40Gi
       advancedMounts:
         main:
           main:
@@ -69,7 +69,7 @@ foldergram:
       advancedMounts:
         main:
           main:
-            - path: /gallery/pictures
+            - path: /gallery/pictures/collections
               readOnly: true
 volsync-target-data:
   pvcTarget: foldergram-data

clusters/cl01tl/helm/gatus/values.yaml

@@ -185,9 +185,6 @@ gatus:
       - name: komodo
         url: https://komodo.alexlebens.net
         <<: *defaults
-      - name: dependency-track
-        url: https://dependency-track.alexlebens.net
-        <<: *defaults
       - name: omni-tools
         url: https://omni-tools.alexlebens.net
         <<: *defaults

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

@@ -23,7 +23,7 @@ home-assistant:
         code-server:
           image:
             repository: ghcr.io/linuxserver/code-server
-            tag: 4.114.1-ls330@sha256:4dabed7dc766d3034778aa648ff6b89f0b04755a069fc1071ac0f22484b7c587
+            tag: 4.115.0-ls331@sha256:308f49acac8734542560f797d79b15e4c872c4d3f97d1b22862633fcce2af62a
           env:
             - name: TZ
               value: America/Chicago

clusters/cl01tl/helm/homepage/values.yaml

@@ -387,12 +387,6 @@ homepage:
                       secret: {{ "{{HOMEPAGE_VAR_KOMODO_API_SECRET}}" }}
                       showStacks: true
                       fields: ["running", "down", "unhealthy", "unknown"]
-              - Vulnerability Scanning:
-                  icon: https://raw.githubusercontent.com/DependencyTrack/branding/f77a4ad3b469ff656856ea225f26b1610b89a584/dt-logo-symbol.svg
-                  description: Dependency Track
-                  href: https://dependency-track.alexlebens.net
-                  siteMonitor: http://dependency-track-frontend.dependency-track:8080
-                  statusStyle: dot
               - Uptime:
                   icon: sh-gatus.webp
                   description: Gatus

clusters/cl01tl/helm/qbittorrent/values.yaml

@@ -208,7 +208,7 @@ qbittorrent:
         qui:
           image:
             repository: ghcr.io/autobrr/qui
-            tag: v1.16.0@sha256:fcdced7cb8395ce039f2c5f920d890d4ad8bd849faec4c4df31701a8f13423cb
+            tag: v1.16.1@sha256:07b6ea9572e52e8b5f70f8fb15a7c688d8d754a7616242d3ad0b21dbd5c05836
           env:
             - name: QUI__METRICS_ENABLED
               value: true

clusters/cl01tl/helm/stalwart/templates/elasticsearch.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   # renovate: datasource=docker depName=elasticsearch
-  version: 9.3.2
+  version: 9.3.3
   auth:
     fileRealm:
       - secretName: stalwart-elasticsearch-secret

clusters/cl01tl/helm/tubearchivist/templates/elasticsearch.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   # renovate: datasource=docker depName=elasticsearch
-  version: 9.3.2
+  version: 9.3.3
   auth:
     fileRealm:
       - secretName: tubearchivist-elasticsearch-secret

hosts/ps08rp/blocky/config.yml

@@ -86,7 +86,6 @@ customDNS:
     bazarr                          IN      CNAME   traefik-cl01tl
     ceph                            IN      CNAME   traefik-cl01tl
     dawarich                        IN      CNAME   traefik-cl01tl
-    dependency-track                IN      CNAME   traefik-cl01tl
     directus                        IN      CNAME   traefik-cl01tl
     excalidraw                      IN      CNAME   traefik-cl01tl
     feishin                         IN      CNAME   traefik-cl01tl

hosts/ps09rp/blocky/config.yml

@@ -107,7 +107,6 @@ customDNS:
     bazarr                          IN      CNAME   traefik-cl01tl
     ceph                            IN      CNAME   traefik-cl01tl
     dawarich                        IN      CNAME   traefik-cl01tl
-    dependency-track                IN      CNAME   traefik-cl01tl
     directus                        IN      CNAME   traefik-cl01tl
     excalidraw                      IN      CNAME   traefik-cl01tl
     feishin                         IN      CNAME   traefik-cl01tl