From 5347c902545ebc79ba07feb28dbcef46650dd3b0 Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Fri, 28 Jun 2024 22:30:27 -0800
Subject: [PATCH] use ingress

---
 charts/fp/Chart.yaml          |  2 +-
 charts/fp/templates/echo.yaml | 79 ++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/charts/fp/Chart.yaml b/charts/fp/Chart.yaml
index 8018364..a94e9af 100644
--- a/charts/fp/Chart.yaml
+++ b/charts/fp/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: fp
 description: The Galaxy's Best VTuber Hentai Site
-version: 0.0.20
+version: 0.0.21
 keywords:
   - fp
   - futureporn
diff --git a/charts/fp/templates/echo.yaml b/charts/fp/templates/echo.yaml
index 7c1d6c9..6702116 100644
--- a/charts/fp/templates/echo.yaml
+++ b/charts/fp/templates/echo.yaml
@@ -41,50 +41,51 @@ spec:
       port: 8001
       targetPort: 5678
 
----
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: echo
-  namespace: futureporn
-
-spec:
-  entryPoints:
-    - web
-    - websecure
-  tls:
-    secretName: echo-cert
-  routes:
-  - match: Host(`echo.fp.sbtp.xyz`) || PathPrefix(`/extra/echo`)
-    kind: Rule
-    services:
-    - name: echo
-      port: 8001
-
-# --- 
-# apiVersion: networking.k8s.io/v1
-# kind: Ingress
+# ---
+# apiVersion: traefik.io/v1alpha1
+# kind: IngressRoute
 # metadata:
 #   name: echo
 #   namespace: futureporn
-#   annotations:
-#     traefik.ingress.kubernetes.io/router.entrypoints: web
-#     traefik.ingress.kubernetes.io/router.tls: "false"
-#     # cert-manager.io/cluster-issuer: "{{ .Values.certManager.issuer }}"
+
 # spec:
-#   rules:
-#     - host: "{{ .Values.echo.hostname }}"
-#       http:
-#         paths:
-#           - path: /
-#             pathType: Prefix
-#             backend:
-#               service:
-#                 name: echo
-#                 port:
-#                   number: 8001
+#   entryPoints:
+#     - web
+#     - websecure
 #   tls:
-#     - secretName: echo-cert
+#     secretName: echo-cert
+#   routes:
+#   - match: Host(`echo.fp.sbtp.xyz`) || PathPrefix(`/extra/echo`)
+#     kind: Rule
+#     services:
+#     - name: echo
+#       port: 8001
+
+--- 
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: echo
+  namespace: futureporn
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    traefik.ingress.kubernetes.io/router.entrypoints: web,websecure,traefik
+    traefik.ingress.kubernetes.io/router.tls: "false"
+    cert-manager.io/cluster-issuer: "{{ .Values.certManager.issuer }}"
+spec:
+  rules:
+    - host: "{{ .Values.echo.hostname }}"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: echo
+                port:
+                  number: 8001
+  tls:
+    - secretName: echo-cert
 
 
 {{ if eq .Values.environment "development" }}