From fa69a731a2aa84489c367aaea1edbd7c519d9d99 Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Mon, 14 Dec 2020 10:18:56 -0500
Subject: [PATCH] upgrade ingress

---
 .gitignore                  |  1 +
 README.md                   |  6 ++++++
 helm/templates/ingress.yaml | 36 ++++++++++++++++++++++++++----------
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a293713
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.data
\ No newline at end of file
diff --git a/README.md b/README.md
index fa27af8..b2eaf5c 100644
--- a/README.md
+++ b/README.md
@@ -77,3 +77,9 @@ export DISK=/nvme
 export DISK=/mnt/enc0/kube
 export DISK=/mnt/USB_SSD/kube
 ```
+
+### Mac
+
+```bash
+sudo rsync --progress -v ./test.data /Volumes/Backup/test.data
+```
\ No newline at end of file
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
index 5cbed91..3d42539 100644
--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -2,31 +2,29 @@
 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 }}-glances
       port: 61208
-
+    middlewares:
+      - name: basic-auth-{{ .Release.Name }}
 ---
-
 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
@@ -37,5 +35,23 @@ spec:
     - name: {{ .Release.Name }}-glances
       port: 61208
     middlewares:
-      - name: httpsredirect
+      - name: httpsredirect-{{ .Release.Name }}
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: httpsredirect-{{ .Release.Name }}
+spec:
+  redirectScheme:
+    scheme: https
+    permanent: true
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: basic-auth-{{ .Release.Name }}
+spec:
+  basicAuth:
+    secret: authsecret
+    removeHeader: true
 {{ end }}
\ No newline at end of file