From aef6a98f98669295498b96ea0188bc28a8d3c21a Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Fri, 11 Dec 2020 17:21:09 -0500
Subject: [PATCH] upgrade ingress

---
 helm/templates/ingress.yaml | 57 +++++++++++--------------------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
index 7853e92..ca2f50e 100644
--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -1,31 +1,27 @@
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: {{ .Release.Name }}-internal-tls
+  name: {{ .Release.Name }}-tls
   annotations:
-    kubernetes.io/ingress.class: traefik-internal
+    kubernetes.io/ingress.class: traefik
 spec:
   entryPoints:
     - websecure
   tls:
-    certResolver: myresolver
-    domains:
-    - main: "*.ducoterra.net"
+    certResolver: duconet
   routes:
   - match: Host(`{{ .Release.Name }}.ducoterra.net`)
     kind: Rule
     services:
     - name: {{ .Release.Name }}
       port: {{ .Values.port }}
-
 ---
-
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: {{ .Release.Name }}-internal-web
+  name: {{ .Release.Name }}
   annotations:
-    kubernetes.io/ingress.class: traefik-internal
+    kubernetes.io/ingress.class: traefik
 spec:
   entryPoints:
     - web
@@ -36,43 +32,22 @@ spec:
     - name: {{ .Release.Name }}
       port: {{ .Values.port }}
     middlewares:
-      - name: httpsredirect
-
+      - name: httpsredirect-{{ .Release.Name }}
 ---
 apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
+kind: Middleware
 metadata:
-  name: {{ .Release.Name }}-external-tls
-  annotations:
-    kubernetes.io/ingress.class: traefik-external
+  name: httpsredirect-{{ .Release.Name }}
 spec:
-  entryPoints:
-    - websecure
-  tls:
-    certResolver: myresolver
-  routes:
-  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: {{ .Release.Name }}
-      port: {{ .Values.port }}
-
+  redirectScheme:
+    scheme: https
+    permanent: true
 ---
-
 apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
+kind: Middleware
 metadata:
-  name: {{ .Release.Name }}-external-web
-  annotations:
-    kubernetes.io/ingress.class: traefik-external
+  name: basic-auth-{{ .Release.Name }}
 spec:
-  entryPoints:
-    - web
-  routes:
-  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: {{ .Release.Name }}
-      port: {{ .Values.port }}
-    middlewares:
-      - name: httpsredirect
+  basicAuth:
+    secret: authsecret
+    removeHeader: true
\ No newline at end of file