From c5778450e70bc52c2537b730a97299f1bdb60b00 Mon Sep 17 00:00:00 2001
From: Julius Tens <mail@juliustens.eu>
Date: Mon, 18 Sep 2023 07:49:17 +0200
Subject: [PATCH] chore: move pricemap redirect to tilia cluster

---
 cloud-resources/cloudflare.tf                            | 5 ++---
 kubernetes/apps/kustomization.yaml                       | 2 +-
 kubernetes/apps/travel-price-map-redirects/ingress.yaml  | 7 +++----
 .../apps/travel-price-map-redirects/kustomization.yaml   | 1 +
 .../apps/travel-price-map-redirects/middleware.yaml      | 9 +++++++++
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 kubernetes/apps/travel-price-map-redirects/middleware.yaml

diff --git a/cloud-resources/cloudflare.tf b/cloud-resources/cloudflare.tf
index 7a31a84..9a331c1 100644
--- a/cloud-resources/cloudflare.tf
+++ b/cloud-resources/cloudflare.tf
@@ -2,7 +2,6 @@ variable "cloudflare_api_token" {}
 variable "cloudflare_account_id" {}
 
 locals {
-  cluster_domain = "cluster.infra.public-transport.earth"
   tilia_cluster_domain = "tilia.cluster.infra.public-transport.earth"
 }
 
@@ -162,7 +161,7 @@ resource "cloudflare_record" "pricemap_eu_root" {
   zone_id = cloudflare_zone.pricemap_eu.id
   type    = "CNAME"
   name    = "@"
-  value   = local.cluster_domain
+  value   = local.tilia_cluster_domain
   proxied = true
 }
 
@@ -170,6 +169,6 @@ resource "cloudflare_record" "pricemap_eu_subdomains" {
   zone_id = cloudflare_zone.pricemap_eu.id
   type    = "CNAME"
   name    = "*"
-  value   = local.cluster_domain
+  value   = local.tilia_cluster_domain
   proxied = true
 }
diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index b88af17..ad42f06 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -15,4 +15,4 @@ resources:
   # - v5-vbb-transport-rest
   - umami
   - chore-score-bot
-  # - travel-price-map-redirects
+  - travel-price-map-redirects
diff --git a/kubernetes/apps/travel-price-map-redirects/ingress.yaml b/kubernetes/apps/travel-price-map-redirects/ingress.yaml
index bb076bd..f71bf16 100644
--- a/kubernetes/apps/travel-price-map-redirects/ingress.yaml
+++ b/kubernetes/apps/travel-price-map-redirects/ingress.yaml
@@ -4,10 +4,9 @@ metadata:
   name: travel-price-map-redirects-ingress
   namespace: travel-price-map-redirects
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    cert-manager.io/cluster-issuer: "certificate-issuer"
-    nginx.ingress.kubernetes.io/server-snippet: |
-      return 301 https://github.com/juliuste/travel-price-map;
+    kubernetes.io/ingress.class: "traefik"
+    cert-manager.io/cluster-issuer: "cert-issuer"
+    traefik.ingress.kubernetes.io/router.middlewares: "travel-price-map-redirects-travel-price-map-redirects-middleware@kubernetescrd"
   labels:
     app.kubernetes.io/name: travel-price-map-redirects-ingress
     app.kubernetes.io/instance: travel-price-map-redirects
diff --git a/kubernetes/apps/travel-price-map-redirects/kustomization.yaml b/kubernetes/apps/travel-price-map-redirects/kustomization.yaml
index 20c695f..ce7901b 100644
--- a/kubernetes/apps/travel-price-map-redirects/kustomization.yaml
+++ b/kubernetes/apps/travel-price-map-redirects/kustomization.yaml
@@ -3,4 +3,5 @@ kind: Kustomization
 namespace: travel-price-map-redirects
 resources:
   - namespace.yaml
+  - middleware.yaml
   - ingress.yaml
diff --git a/kubernetes/apps/travel-price-map-redirects/middleware.yaml b/kubernetes/apps/travel-price-map-redirects/middleware.yaml
new file mode 100644
index 0000000..fb7a2b3
--- /dev/null
+++ b/kubernetes/apps/travel-price-map-redirects/middleware.yaml
@@ -0,0 +1,9 @@
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: travel-price-map-redirects-middleware
+  namespace: travel-price-map-redirects
+spec:
+  redirectRegex:
+    regex: ^(.*)
+    replacement: https://github.com/juliuste/travel-price-map