consolidate traefik

.gitlab-ci.yml

@@ -19,7 +19,6 @@ build:
   script:
     - echo $DEPLOY
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-
 deploy_to_prod:
   variables:
     DEPLOY: prod

config.yml

@@ -6,7 +6,7 @@ footer: false
 
 links: [] # Allows for navbar (dark mode, layout, and search) without any links
 services:
-  - name: "DevOps"
+  - name: "DevSecOps"
     icon: "fas fa-code-branch"
     items:
       - name: "Gitlab"
@@ -14,6 +14,11 @@ services:
         tag: "CI"
         url: "https://gitlab.ducoterra.net/"
         target: '_blank'
+      - name: "pgAdmin"
+        logo: "assets/tools/pgadmin.ico"
+        tag: "CI"
+        url: "https://pgadmin.ducoterra.net/"
+        target: '_blank'
   - name: "Storage"
     icon: "fas fa-save"
     items:
@@ -53,7 +58,7 @@ services:
         url: "https://zipkin.ducoterra.net/"
         tag: "Monitoring"
         target: '_blank'
-      - name: "Glances"
+      - name: "Mainframe"
         logo: "assets/tools/glances.png"
         url: "https://monitor.ducoterra.net/"
         tag: "Monitoring"
@@ -61,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"
@@ -71,31 +81,3 @@ services:
         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'
-      - name: "Pihole1"
-        logo: assets/tools/pihole.svg
-        tag: "Network"
-        url: "https://pihole1.ducoterra.net/admin/"
-        target: '_blank'
-      - name: "Pihole2"
-        logo: assets/tools/pihole.svg
-        tag: "Network"
-        url: "https://pihole2.ducoterra.net/admin/"
-        target: '_blank'
-  - name: "Tools"
-    icon: "fas fa-wrench"
-    items:
-      - name: "SVG Editor"
-        icon: "fas fa-icons"
-        tag: "Tools"
-        url: "https://svg-edit.github.io/svgedit/editor/svg-editor.html"
-        target: '_blank'

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
+      - 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