diff --git a/config.yml b/config.yml index 37af23a..fd3bd66 100644 --- a/config.yml +++ b/config.yml @@ -66,6 +66,11 @@ services: - name: "Network" icon: "fas fa-server" items: + - name: "Traefik" + logo: assets/tools/traefik.png + tag: "Network" + url: "https://traefik.ducoterra.net/" + target: '_blank' - name: "Unifi" logo: assets/tools/unifi.png tag: "Network" @@ -75,14 +80,4 @@ services: logo: assets/tools/protect.ico tag: "Network" url: "https://protect.ui.com/" - target: '_blank' - - name: "Traefik Internal" - logo: assets/tools/traefik.png - tag: "Network" - url: "https://traefik-internal.ducoterra.net/" - target: '_blank' - - name: "Traefik External" - logo: assets/tools/traefik.png - tag: "Network" - url: "https://traefik-external.ducoterra.net/" - target: '_blank' + target: '_blank' \ No newline at end of file diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml index 17e5ec8..32fe956 100644 --- a/helm/templates/ingress.yaml +++ b/helm/templates/ingress.yaml @@ -1,31 +1,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 }} port: 8080 - + 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 @@ -36,4 +34,22 @@ spec: - name: {{ .Release.Name }} port: 8080 middlewares: - - name: httpsredirect \ No newline at end of file + - 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 \ No newline at end of file