From d803e75e71328c9754a484faa0c4cf9efa7322d3 Mon Sep 17 00:00:00 2001
From: Florian Herrengt <contact@florianherrengt.com>
Date: Thu, 2 Feb 2023 13:17:35 +0000
Subject: [PATCH] http redirect to https

---
 kustomization/bases/kustomization.yaml                   | 2 +-
 kustomization/bases/nocodelytics-dashboard.yaml          | 7 -------
 kustomization/bases/traefik.yaml                         | 8 ++++++++
 .../overlays/production/nocodelytics-dashboard.yaml      | 2 ++
 .../overlays/staging/nocodelytics-dashboard.yaml         | 9 ++-------
 5 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 kustomization/bases/traefik.yaml

diff --git a/kustomization/bases/kustomization.yaml b/kustomization/bases/kustomization.yaml
index 37ccd6a..8a398f6 100644
--- a/kustomization/bases/kustomization.yaml
+++ b/kustomization/bases/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ./nocodelytics-events-worker.yaml
   - ./nocodelytics-tracker-api.yaml
   - ./cert-manager.yaml
-
+  - ./traefik.yaml
 secretGenerator:
   - name: regcred
     type: kubernetes.io/dockerconfigjson
diff --git a/kustomization/bases/nocodelytics-dashboard.yaml b/kustomization/bases/nocodelytics-dashboard.yaml
index edbd9f7..5abf62b 100644
--- a/kustomization/bases/nocodelytics-dashboard.yaml
+++ b/kustomization/bases/nocodelytics-dashboard.yaml
@@ -107,13 +107,6 @@ spec:
     - host: default.nocodelytics.com
       http:
         paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: ssl-redirect
-                port:
-                  name: use-annotation
           - path: /
             pathType: Prefix
             backend:
diff --git a/kustomization/bases/traefik.yaml b/kustomization/bases/traefik.yaml
new file mode 100644
index 0000000..01ce4fd
--- /dev/null
+++ b/kustomization/bases/traefik.yaml
@@ -0,0 +1,8 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: https-redirect
+spec:
+  redirectScheme:
+    scheme: https
+    permanent: true
diff --git a/kustomization/overlays/production/nocodelytics-dashboard.yaml b/kustomization/overlays/production/nocodelytics-dashboard.yaml
index f06343f..59f8145 100644
--- a/kustomization/overlays/production/nocodelytics-dashboard.yaml
+++ b/kustomization/overlays/production/nocodelytics-dashboard.yaml
@@ -11,6 +11,8 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: nocodelytics-dashboard-nginx-ingress
+  annotations:
+    traefik.ingress.kubernetes.io/router.middlewares: production-https-redirect@kubernetescrd
 spec:
   rules:
     - host: api.nocodelytics.com
diff --git a/kustomization/overlays/staging/nocodelytics-dashboard.yaml b/kustomization/overlays/staging/nocodelytics-dashboard.yaml
index cd91ae1..c154934 100644
--- a/kustomization/overlays/staging/nocodelytics-dashboard.yaml
+++ b/kustomization/overlays/staging/nocodelytics-dashboard.yaml
@@ -11,18 +11,13 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: nocodelytics-dashboard-nginx-ingress
+  annotations:
+    traefik.ingress.kubernetes.io/router.middlewares: staging-https-redirect@kubernetescrd
 spec:
   rules:
     - host: staging.nocodelytics.com
       http:
         paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: ssl-redirect
-                port:
-                  name: use-annotation
           - path: /
             pathType: Prefix
             backend: