From e2305d06c0734d2a110e64aeb401a4a1c24f9497 Mon Sep 17 00:00:00 2001
From: Alexander Rogov <i_am@rogov.al>
Date: Mon, 13 Jul 2026 01:11:16 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20merge=20ingress=20paths=20=E2=80=94=20/m?=
 =?UTF-8?q?astodon/=20to=20minio,=20/=20to=20mastodon-web?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 argocd/apps/mastodon.yaml                              |  2 +-
 .../mastodon/{ingress-minio.yaml => ingress.yaml}      | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename manifests/mastodon/{ingress-minio.yaml => ingress.yaml} (76%)

diff --git a/argocd/apps/mastodon.yaml b/argocd/apps/mastodon.yaml
index e00f3bb..e19a2a4 100644
--- a/argocd/apps/mastodon.yaml
+++ b/argocd/apps/mastodon.yaml
@@ -119,7 +119,7 @@ spec:
             username: dummy
             password: dummy
           ingress:
-            enabled: true
+            enabled: false
             className: traefik
             annotations:
               cert-manager.io/cluster-issuer: letsencrypt-production
diff --git a/manifests/mastodon/ingress-minio.yaml b/manifests/mastodon/ingress.yaml
similarity index 76%
rename from manifests/mastodon/ingress-minio.yaml
rename to manifests/mastodon/ingress.yaml
index 9644809..0fb068e 100644
--- a/manifests/mastodon/ingress-minio.yaml
+++ b/manifests/mastodon/ingress.yaml
@@ -1,13 +1,12 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: mastodon-minio
+  name: mastodon
   namespace: mastodon
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
     traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/router.priority: "20"
 spec:
   ingressClassName: traefik
   tls:
@@ -25,3 +24,10 @@ spec:
                 name: minio-proxy
                 port:
                   number: 80
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: mastodon-web
+                port:
+                  number: 3000