upgrade ingress

docs/index.md

@@ -38,4 +38,5 @@
 ### [Day 5](day5.md): import
 
 - "import"
-- 
+- Breaking apart our terrible weather app
+- Importing our menu

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

mkdocs.yml

@@ -6,6 +6,7 @@ nav:
   - Day 2: day2.md
   - Day 3: day3.md
   - Day 4: day4.md
+  - Day 5: day5.md
 theme:
   name: material
 markdown_extensions: