From 9b2c655a0255e39957d3833d2fab4356aafdb7ab Mon Sep 17 00:00:00 2001
From: rasmus <rasmus@k-space.ee>
Date: Sat, 3 Aug 2024 05:02:29 +0300
Subject: [PATCH] camtiler: unify to cam.k-space.ee

---
 camtiler/README.md                            |  2 +-
 ...cams.graphviz.svg => cameras.graphviz.svg} |  0
 camtiler/ingress.yml                          | 35 +++++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)
 rename camtiler/{cams.graphviz.svg => cameras.graphviz.svg} (100%)

diff --git a/camtiler/README.md b/camtiler/README.md
index 0a58b22..a81b2eb 100644
--- a/camtiler/README.md
+++ b/camtiler/README.md
@@ -4,7 +4,7 @@ Camtiler is the umbrella name for our homegrown camera surveilance system.
 Everything besides [Camera](#camera)s is deployed with Kubernetes.
 
 ## Components
-![cams.graphviz.svg](cams.graphviz.svg)
+![cameras.graphviz.svg](cameras.graphviz.svg)
 <!-- Manually rendered with https://dreampuf.github.io/GraphvizOnline
 digraph G {
   "camera-operator" -> "camera-motion-detect" [label="deploys"]
diff --git a/camtiler/cams.graphviz.svg b/camtiler/cameras.graphviz.svg
similarity index 100%
rename from camtiler/cams.graphviz.svg
rename to camtiler/cameras.graphviz.svg
diff --git a/camtiler/ingress.yml b/camtiler/ingress.yml
index 1ccf059..cf192d6 100644
--- a/camtiler/ingress.yml
+++ b/camtiler/ingress.yml
@@ -5,7 +5,7 @@ metadata:
   name: sso
 spec:
   displayName: Cameras
-  uri: 'https://cams.k-space.ee/tiled'
+  uri: 'https://cam.k-space.ee/tiled'
   allowedGroups:
     - k-space:floor
     - k-space:friends
@@ -17,21 +17,12 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: traefik
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.middlewares: camtiler-sso@kubernetescrd,camtiler-redirect@kubernetescrd
+    traefik.ingress.kubernetes.io/router.middlewares: camtiler-sso@kubernetescrd
     traefik.ingress.kubernetes.io/router.tls: "true"
     external-dns.alpha.kubernetes.io/target: traefik.k-space.ee
+    external-dns.alpha.kubernetes.io/hostname: cams.k-space.ee,cam.k-space.ee
 spec:
   rules:
-    - host: cams.k-space.ee
-      http:
-        paths:
-          - pathType: Prefix
-            path: "/"
-            backend:
-              service:
-                name: logmower-frontend
-                port:
-                  number: 8080
     - host: cam.k-space.ee
       http:
         paths:
@@ -70,9 +61,25 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: redirect
+  name: cams-redirect
 spec:
   redirectRegex:
     regex: ^https://cams.k-space.ee/(.*)$
     replacement: https://cam.k-space.ee/$1
-    permanent: false
+    permanent: true
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: cams
+spec:
+  entryPoints:
+    - websecure
+  routes:
+  - match: Host(`cams.k-space.ee`)
+    kind: Rule
+    middlewares:
+      - name: cams-redirect
+    services:
+      - kind: TraefikService
+        name: api@internal