From fca3c066db6f79618c079a7453d2a5a3f06b231e Mon Sep 17 00:00:00 2001 From: un-oeil Date: Sun, 11 Oct 2026 21:37:30 +0200 Subject: [PATCH] fix paper and traeffik --- README.md | 14 +++----------- apps/firefly/deployment.yaml | 3 +++ apps/freshrss/deployment.yaml | 3 +++ apps/hedgedoc/deployment.yaml | 3 +++ apps/homepage/config/services.yaml | 8 ++++++++ apps/homepage/deployment.yaml | 3 +++ apps/it-tools/deployment.yaml | 3 +++ apps/linkwarden/deployment.yaml | 3 +++ apps/n8n/deployment.yaml | 3 +++ apps/ntfy/deployment.yaml | 3 +++ apps/paperless/deployment.yaml | 3 +++ apps/paperless/valkey.yaml | 3 +++ apps/postgres/statefulset.yaml | 3 +++ apps/privatebin/deployment.yaml | 3 +++ apps/searxng/deployment.yaml | 3 +++ apps/stirling-pdf/deployment.yaml | 3 +++ apps/vikunja/deployment.yaml | 3 +++ apps/whoami/deployment.yaml | 3 +++ apps/wikijs/deployment.yaml | 3 +++ argocd-install/ingress.yaml | 4 ++-- infra/traefik/helmchartconfig.yaml | 28 +++++++++++++++++++++++++--- 21 files changed, 89 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 17d922d..052ab48 100644 --- a/README.md +++ b/README.md @@ -182,17 +182,9 @@ kubectl apply --server-side -k argocd-install/ kubectl -n argocd rollout status deploy/argocd-server kubectl apply -f bootstrap/root.yaml ``` -Argo CD UI: https://argocd.un-oeil.fr, admin laptop only. The Caddy vhost -allows `10.10.10.2` and answers 403 to every other WireGuard peer: -``` -argocd.un-oeil.fr { - @admin remote_ip 10.10.10.2 - handle @admin { - reverse_proxy 10.0.0.141:80 10.0.0.142:80 10.0.0.143:80 - } - respond 403 -} -``` +Argo CD UI: https://argocd.un-oeil.fr through Caddy, behind Argo's own login. +Caddy can't restrict it to the admin laptop: the WireGuard hub masquerades +every peer as `10.0.0.250`, so `remote_ip` never sees `10.10.10.2`. Without Caddy: `kubectl -n argocd port-forward svc/argocd-server 8080:80`. Longhorn UI: `kubectl -n longhorn-system port-forward svc/longhorn-frontend 8081:80` (or the same Caddy pattern with a `longhorn.un-oeil.fr` Ingress). diff --git a/apps/firefly/deployment.yaml b/apps/firefly/deployment.yaml index 711b4d6..b780ba0 100644 --- a/apps/firefly/deployment.yaml +++ b/apps/firefly/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: firefly spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false securityContext: # The image runs as www-data (33). fsGroup: 33 diff --git a/apps/freshrss/deployment.yaml b/apps/freshrss/deployment.yaml index c8c93de..f5c8ef0 100644 --- a/apps/freshrss/deployment.yaml +++ b/apps/freshrss/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: freshrss spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: freshrss image: freshrss/freshrss:1.30.1 diff --git a/apps/hedgedoc/deployment.yaml b/apps/hedgedoc/deployment.yaml index d0be26b..0e1b893 100644 --- a/apps/hedgedoc/deployment.yaml +++ b/apps/hedgedoc/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: hedgedoc spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false securityContext: fsGroup: 10000 containers: diff --git a/apps/homepage/config/services.yaml b/apps/homepage/config/services.yaml index f75d402..f83c2c8 100644 --- a/apps/homepage/config/services.yaml +++ b/apps/homepage/config/services.yaml @@ -13,6 +13,14 @@ type: uptimekuma url: https://status.un-oeil.fr slug: homelab + - Argo CD: + href: https://argocd.un-oeil.fr + siteMonitor: https://argocd.un-oeil.fr/healthz + icon: argo-cd.svg + widget: + type: uptimekuma + url: https://status.un-oeil.fr + slug: k3s - Pelican: href: https://pelican.un-oeil.fr siteMonitor: https://pelican.un-oeil.fr diff --git a/apps/homepage/deployment.yaml b/apps/homepage/deployment.yaml index 5031608..e40cf57 100644 --- a/apps/homepage/deployment.yaml +++ b/apps/homepage/deployment.yaml @@ -12,6 +12,9 @@ spec: labels: app: homepage spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: homepage image: ghcr.io/gethomepage/homepage:v2.5.0 diff --git a/apps/it-tools/deployment.yaml b/apps/it-tools/deployment.yaml index 7879aff..8c890bf 100644 --- a/apps/it-tools/deployment.yaml +++ b/apps/it-tools/deployment.yaml @@ -12,6 +12,9 @@ spec: labels: app: it-tools spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: it-tools image: corentinth/it-tools:2024.10.22-7ca5933 diff --git a/apps/linkwarden/deployment.yaml b/apps/linkwarden/deployment.yaml index dcd25db..d575ed3 100644 --- a/apps/linkwarden/deployment.yaml +++ b/apps/linkwarden/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: linkwarden spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: linkwarden image: ghcr.io/linkwarden/linkwarden:v2.16.3 diff --git a/apps/n8n/deployment.yaml b/apps/n8n/deployment.yaml index aed7454..97e0c61 100644 --- a/apps/n8n/deployment.yaml +++ b/apps/n8n/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: n8n spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false securityContext: # The image runs as node (1000). fsGroup: 1000 diff --git a/apps/ntfy/deployment.yaml b/apps/ntfy/deployment.yaml index 5b989d9..2fe1a78 100644 --- a/apps/ntfy/deployment.yaml +++ b/apps/ntfy/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: ntfy spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: ntfy image: binwiederhier/ntfy:v2.29.0 diff --git a/apps/paperless/deployment.yaml b/apps/paperless/deployment.yaml index b6273e0..9d3cf35 100644 --- a/apps/paperless/deployment.yaml +++ b/apps/paperless/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: paperless spec: + # The "paperless" Service would inject PAPERLESS_PORT=tcp://..., which + # Paperless reads as its own port setting and crashes on. + enableServiceLinks: false containers: - name: paperless image: ghcr.io/paperless-ngx/paperless-ngx:3.3.0 diff --git a/apps/paperless/valkey.yaml b/apps/paperless/valkey.yaml index 3a2233f..899fe53 100644 --- a/apps/paperless/valkey.yaml +++ b/apps/paperless/valkey.yaml @@ -13,6 +13,9 @@ spec: labels: app: valkey spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: valkey image: valkey/valkey:8.1.10-alpine diff --git a/apps/postgres/statefulset.yaml b/apps/postgres/statefulset.yaml index d45541c..ad0b3b6 100644 --- a/apps/postgres/statefulset.yaml +++ b/apps/postgres/statefulset.yaml @@ -13,6 +13,9 @@ spec: labels: app: postgres spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: postgres image: postgres:17.11-alpine diff --git a/apps/privatebin/deployment.yaml b/apps/privatebin/deployment.yaml index f3e7897..424cbcc 100644 --- a/apps/privatebin/deployment.yaml +++ b/apps/privatebin/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: privatebin spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false securityContext: # The image runs as nobody:www-data (65534:82). fsGroup: 82 diff --git a/apps/searxng/deployment.yaml b/apps/searxng/deployment.yaml index 733a2ae..3ebeda3 100644 --- a/apps/searxng/deployment.yaml +++ b/apps/searxng/deployment.yaml @@ -12,6 +12,9 @@ spec: labels: app: searxng spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: searxng image: searxng/searxng:2026.10.4-d48c4b555 diff --git a/apps/stirling-pdf/deployment.yaml b/apps/stirling-pdf/deployment.yaml index b53fab7..eddc879 100644 --- a/apps/stirling-pdf/deployment.yaml +++ b/apps/stirling-pdf/deployment.yaml @@ -12,6 +12,9 @@ spec: labels: app: stirling-pdf spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: stirling-pdf image: stirlingtools/stirling-pdf:3.1.0 diff --git a/apps/vikunja/deployment.yaml b/apps/vikunja/deployment.yaml index c9d112d..36ef3f1 100644 --- a/apps/vikunja/deployment.yaml +++ b/apps/vikunja/deployment.yaml @@ -14,6 +14,9 @@ spec: labels: app: vikunja spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false securityContext: fsGroup: 1000 containers: diff --git a/apps/whoami/deployment.yaml b/apps/whoami/deployment.yaml index 180a703..c673779 100644 --- a/apps/whoami/deployment.yaml +++ b/apps/whoami/deployment.yaml @@ -12,6 +12,9 @@ spec: labels: app: whoami spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: whoami image: traefik/whoami:v1.11.0 diff --git a/apps/wikijs/deployment.yaml b/apps/wikijs/deployment.yaml index f04e8aa..2d53592 100644 --- a/apps/wikijs/deployment.yaml +++ b/apps/wikijs/deployment.yaml @@ -12,6 +12,9 @@ spec: labels: app: wikijs spec: + # No _PORT=tcp://... env vars: apps like Paperless read + # PAPERLESS_PORT as their own setting and crash. + enableServiceLinks: false containers: - name: wikijs image: ghcr.io/requarks/wiki:2.5.314 diff --git a/argocd-install/ingress.yaml b/argocd-install/ingress.yaml index 9d5f4fb..5c0b1d4 100644 --- a/argocd-install/ingress.yaml +++ b/argocd-install/ingress.yaml @@ -1,5 +1,5 @@ -# https://argocd.un-oeil.fr through Caddy (LXC 100), which only lets the admin -# laptop in (remote_ip 10.10.10.2) and answers 403 to everyone else. +# https://argocd.un-oeil.fr through Caddy (LXC 100), over WireGuard only. +# Protected by Argo's own login. apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/infra/traefik/helmchartconfig.yaml b/infra/traefik/helmchartconfig.yaml index a4b1b6f..117af6e 100644 --- a/infra/traefik/helmchartconfig.yaml +++ b/infra/traefik/helmchartconfig.yaml @@ -1,6 +1,4 @@ -# Trust X-Forwarded-For from Caddy (10.0.0.10), so apps see the real client IP -# instead of Caddy's. Requests reach Traefik through ServiceLB, which rewrites -# the source to a node or pod address, hence the two ranges. +# Overrides for the Traefik that k3s bundles (merged over k3s's own values). apiVersion: helm.cattle.io/v1 kind: HelmChartConfig metadata: @@ -8,6 +6,30 @@ metadata: namespace: kube-system spec: valuesContent: |- + # Two copies on two different workers, never on the masters (k3s's + # default tolerations would allow them), so one node going down doesn't + # take every app with it. + deployment: + replicas: 2 + podDisruptionBudget: + enabled: true + minAvailable: 1 + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node-role.kubernetes.io/control-plane + operator: DoesNotExist + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchLabels: + app.kubernetes.io/name: traefik + topologyKey: kubernetes.io/hostname + # Trust X-Forwarded-For from Caddy (10.0.0.10), so apps see the real client + # IP instead of Caddy's. Requests reach Traefik through ServiceLB, which + # rewrites the source to a node or pod address, hence the two ranges. ports: web: forwardedHeaders: