From 8dcb433aa9a590f3040d0c505c91ea0517a86a4c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 4 May 2025 11:30:18 -0400 Subject: [PATCH] ingress tweaks --- .../ingress/templates/_helpers/ingress.tpl | 2 +- .../ingress/templates/_helpers/ingress.ts.tpl | 25 +++++++++++++++++++ .../ingress/templates/middlewares/common.yaml | 24 ++++++++++++++++++ charts/apps/ingress/templates/tailscale.yaml | 3 +++ charts/apps/ingress/values-prod.yaml | 12 +++++++-- charts/apps/ingress/values.yaml | 3 ++- 6 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 charts/apps/ingress/templates/_helpers/ingress.ts.tpl create mode 100644 charts/apps/ingress/templates/middlewares/common.yaml create mode 100644 charts/apps/ingress/templates/tailscale.yaml diff --git a/charts/apps/ingress/templates/_helpers/ingress.tpl b/charts/apps/ingress/templates/_helpers/ingress.tpl index 68c0fa0..9d1ad4b 100644 --- a/charts/apps/ingress/templates/_helpers/ingress.tpl +++ b/charts/apps/ingress/templates/_helpers/ingress.tpl @@ -40,7 +40,7 @@ metadata: namespace: {{ .namespace }} annotations: homelab-ingress/managing-app-namespace: "apps-ingresses" - # traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd + traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd gethomepage.dev/enabled: "true" gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' diff --git a/charts/apps/ingress/templates/_helpers/ingress.ts.tpl b/charts/apps/ingress/templates/_helpers/ingress.ts.tpl new file mode 100644 index 0000000..232902b --- /dev/null +++ b/charts/apps/ingress/templates/_helpers/ingress.ts.tpl @@ -0,0 +1,25 @@ +{{ define "homelab.ingress.tailscale" }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: tailscale-{{.name}} +spec: + ingressClassName: tailscale + defaultBackend: + service: + name: tailscale-{{.name}} + port: + name: main +--- +apiVersion: v1 +kind: Service +metadata: + name: tailscale-{{.name}} +spec: + type: ClusterIP + ports: + - name: main + port: 80 + targetPort: {{.port}} +{{ end }} \ No newline at end of file diff --git a/charts/apps/ingress/templates/middlewares/common.yaml b/charts/apps/ingress/templates/middlewares/common.yaml new file mode 100644 index 0000000..c6d5661 --- /dev/null +++ b/charts/apps/ingress/templates/middlewares/common.yaml @@ -0,0 +1,24 @@ +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: https-redirect + namespace: "{{ .Release.Namespace }}" +spec: + redirectScheme: + scheme: https +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: strict-transport + namespace: "{{ .Release.Namespace }}" +spec: + headers: + hostsProxyHeaders: + - "X-Forwarded-Host" + referrerPolicy: "same-origin" + stsSeconds: 15552000 + stsIncludeSubdomains: true + stsPreload: true + forceSTSHeader: true \ No newline at end of file diff --git a/charts/apps/ingress/templates/tailscale.yaml b/charts/apps/ingress/templates/tailscale.yaml new file mode 100644 index 0000000..41427f1 --- /dev/null +++ b/charts/apps/ingress/templates/tailscale.yaml @@ -0,0 +1,3 @@ +{{ $_, $svc := rangeList .Values.tailScaleServices }} +{{ include "homelab.ingress.tailscale" $svc }} +{{ end }} \ No newline at end of file diff --git a/charts/apps/ingress/values-prod.yaml b/charts/apps/ingress/values-prod.yaml index 971b730..e062424 100644 --- a/charts/apps/ingress/values-prod.yaml +++ b/charts/apps/ingress/values-prod.yaml @@ -15,5 +15,13 @@ services: - prefix: "demo" service: "dummy-app" namespace: "dummy" - # middleware: "apps-ingresses-forwardauth-authentik" - group: "Demo" \ No newline at end of file + middleware: "apps-ingresses-forwardauth-authentik" + group: "Demo" + +tailScaleServices: + - name: "argocd" + namespace: plugin-argo-cd + annotations: + "app.kubernetes.io/instance" : "argo-cd" + "app.kubernetes.io/name" : "argocd-server" + port: 80 \ No newline at end of file diff --git a/charts/apps/ingress/values.yaml b/charts/apps/ingress/values.yaml index 79660de..0bf28cb 100644 --- a/charts/apps/ingress/values.yaml +++ b/charts/apps/ingress/values.yaml @@ -12,4 +12,5 @@ global: reverseProxy: {} -services: [] \ No newline at end of file +services: [] +tailScaleServices: [] \ No newline at end of file