From 0109d2c4e7330b539428816e3ae3d12255c7f34e Mon Sep 17 00:00:00 2001
From: Steffen Illium <steffen.illium@gmail.com>
Date: Mon, 22 Apr 2024 11:03:44 +0200
Subject: [PATCH] new routes, remove web front

---
 .../02-argocd/applications/kustomization.yaml  |  1 -
 .../03-traefik/base/deployment-traefik.yaml    |  9 ---------
 .../base/networking/traefik-service.yaml       |  5 -----
 .../foreign/adguard/adguard-ingress.yaml       | 16 ++++++++++++++++
 .../foreign/adguard/adguard-service.yaml       | 12 ++++++++++++
 .../foreign/adguard/kustomization.yaml         |  3 +++
 .../foreign/fritz/fritz-ingress.yaml           | 18 ------------------
 .../home-assistant/home-assistant-ingress.yaml |  1 -
 8 files changed, 31 insertions(+), 34 deletions(-)
 create mode 100644 infrastructure/03-traefik/foreign/adguard/adguard-ingress.yaml
 create mode 100644 infrastructure/03-traefik/foreign/adguard/adguard-service.yaml
 create mode 100644 infrastructure/03-traefik/foreign/adguard/kustomization.yaml

diff --git a/infrastructure/02-argocd/applications/kustomization.yaml b/infrastructure/02-argocd/applications/kustomization.yaml
index 7ab79b2..37b338d 100644
--- a/infrastructure/02-argocd/applications/kustomization.yaml
+++ b/infrastructure/02-argocd/applications/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- apps-adguard.yaml
 - apps-gitea.yaml
 - apps-nextcloud.yaml
 - apps-paperless.yaml
diff --git a/infrastructure/03-traefik/base/deployment-traefik.yaml b/infrastructure/03-traefik/base/deployment-traefik.yaml
index e6dffd6..110ff5d 100644
--- a/infrastructure/03-traefik/base/deployment-traefik.yaml
+++ b/infrastructure/03-traefik/base/deployment-traefik.yaml
@@ -40,12 +40,6 @@ spec:
         - --entrypoints.websecure-local.transport.respondingTimeouts.readTimeout=300
         - --entrypoints.websecure-local.transport.respondingTimeouts.idleTimeout=0
 
-        - --entrypoints.web-front.address=:8000/tcp
-        - --entrypoints.web-front.transport.respondingTimeouts.readTimeout=300
-        - --entrypoints.web-front.transport.respondingTimeouts.idleTimeout=0
-        #- --entrypoints.web-front.http.redirections.entryPoint.to=websecure-front
-        #- --entrypoints.web-front.http.redirections.entryPoint.scheme=https
-
         - --entrypoints.websecure-front.address=:8443/tcp
         - --entrypoints.websecure-front.http.middlewares=traefik-default-headers
         - --entrypoints.websecure-front.http.tls=true
@@ -112,9 +106,6 @@ spec:
         - containerPort: 443
           name: websecure-local
           protocol: TCP
-        - containerPort: 8000
-          name: web-front
-          protocol: TCP
         - containerPort: 8443
           name: websecure-front
           protocol: TCP
diff --git a/infrastructure/03-traefik/base/networking/traefik-service.yaml b/infrastructure/03-traefik/base/networking/traefik-service.yaml
index 40560ee..606d31d 100644
--- a/infrastructure/03-traefik/base/networking/traefik-service.yaml
+++ b/infrastructure/03-traefik/base/networking/traefik-service.yaml
@@ -38,11 +38,6 @@ spec:
     app: traefik
   ports:
   # Front
-  - name: web
-    port: 80
-    protocol: TCP
-    targetPort: web-front
-    nodePort: 30080
   - name: websecure
     port: 443
     protocol: TCP
diff --git a/infrastructure/03-traefik/foreign/adguard/adguard-ingress.yaml b/infrastructure/03-traefik/foreign/adguard/adguard-ingress.yaml
new file mode 100644
index 0000000..31c8201
--- /dev/null
+++ b/infrastructure/03-traefik/foreign/adguard/adguard-ingress.yaml
@@ -0,0 +1,16 @@
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: adguard-ingress
+  namespace: traefik
+spec:
+  entryPoints:
+    - web-local
+    - websecure-local
+  routes:
+  - match: Host(`adguard.steffenillium.de`)
+    kind: Rule
+    services:
+    - name: adguard-service
+      port: http
+
diff --git a/infrastructure/03-traefik/foreign/adguard/adguard-service.yaml b/infrastructure/03-traefik/foreign/adguard/adguard-service.yaml
new file mode 100644
index 0000000..7415889
--- /dev/null
+++ b/infrastructure/03-traefik/foreign/adguard/adguard-service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: fritz-service
+spec:
+  type: ExternalName
+  externalName: 192.168.178.2
+  ports:
+    - port: 80
+      targetPort: 80
+      protocol: TCP
+      name: http
\ No newline at end of file
diff --git a/infrastructure/03-traefik/foreign/adguard/kustomization.yaml b/infrastructure/03-traefik/foreign/adguard/kustomization.yaml
new file mode 100644
index 0000000..5c1fa84
--- /dev/null
+++ b/infrastructure/03-traefik/foreign/adguard/kustomization.yaml
@@ -0,0 +1,3 @@
+resources:
+  - adguard-ingress.yaml
+  - adguard-service.yaml
\ No newline at end of file
diff --git a/infrastructure/03-traefik/foreign/fritz/fritz-ingress.yaml b/infrastructure/03-traefik/foreign/fritz/fritz-ingress.yaml
index 8cfc1a7..86d3f45 100644
--- a/infrastructure/03-traefik/foreign/fritz/fritz-ingress.yaml
+++ b/infrastructure/03-traefik/foreign/fritz/fritz-ingress.yaml
@@ -13,21 +13,3 @@ spec:
     services:
     - name: fritz-service
       port: http
----
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: fritz-ingress-front
-  namespace: traefik
-spec:
-  entryPoints:
-    - web-front
-    - websecure-front
-  routes:
-  - match: Host(`fritz.steffenillium.de`)
-    kind: Rule
-    # middlewares:
-    # - name: authentik-middleware
-    services:
-    - name: fritz-service
-      port: http
diff --git a/infrastructure/03-traefik/foreign/home-assistant/home-assistant-ingress.yaml b/infrastructure/03-traefik/foreign/home-assistant/home-assistant-ingress.yaml
index c604456..0b70718 100644
--- a/infrastructure/03-traefik/foreign/home-assistant/home-assistant-ingress.yaml
+++ b/infrastructure/03-traefik/foreign/home-assistant/home-assistant-ingress.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: traefik
 spec:
   entryPoints:
-    - web-front
     - websecure-front
     - web-local
     - websecure-local