From 7ccdb0cb2fbd1403965c488b71ea32505d3a6c0d Mon Sep 17 00:00:00 2001 From: WrenIX Date: Tue, 3 Oct 2023 21:22:58 +0200 Subject: [PATCH] fix(headscale): traefik https-backend support --- headscale/Chart.yaml | 2 +- headscale/templates/service.yaml | 10 +++++++--- headscale/templates/traefik.yaml | 8 ++++++++ headscale/values.yaml | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 headscale/templates/traefik.yaml diff --git a/headscale/Chart.yaml b/headscale/Chart.yaml index 933da99..8ea1e59 100644 --- a/headscale/Chart.yaml +++ b/headscale/Chart.yaml @@ -3,7 +3,7 @@ name: headscale description: An open source, self-hosted implementation of the Tailscale control server. icon: https://raw.githubusercontent.com/juanfont/headscale/56a7b1e34952c3e0306a134b2be9b4277f5d8d6e/docs/logo/headscale3-dots.svg type: application -version: 0.2.0 +version: 0.2.1 appVersion: "0.22.3" keywords: - headscale diff --git a/headscale/templates/service.yaml b/headscale/templates/service.yaml index 14f5e31..ee47b4e 100644 --- a/headscale/templates/service.yaml +++ b/headscale/templates/service.yaml @@ -4,10 +4,14 @@ metadata: name: {{ include "headscale.fullname" . }} labels: {{- include "headscale.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} annotations: - {{- toYaml . | nindent 4}} - {{- end }} + {{- if (.Capabilities.APIVersions.Has "traefik.io/v1alpha1/ServersTransport") }} + "traefik.ingress.kubernetes.io/service.serversscheme": "https" + "traefik.ingress.kubernetes.io/service.serverstransport": {{ printf "%s-%s@kubernetescrd" .Release.Namespace (include "headscale.fullname" .) | quote }} + {{- end }} + {{- with .Values.service.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: diff --git a/headscale/templates/traefik.yaml b/headscale/templates/traefik.yaml new file mode 100644 index 0000000..60cd073 --- /dev/null +++ b/headscale/templates/traefik.yaml @@ -0,0 +1,8 @@ +{{- if (.Capabilities.APIVersions.Has "traefik.io/v1alpha1/ServersTransport") }} +apiVersion: traefik.io/v1alpha1 +kind: ServersTransport +metadata: + name: {{ include "headscale.fullname" . }} +spec: + serverName: {{ .Values.headscale.certmanager.dnsNames | first }} +{{- end }} diff --git a/headscale/values.yaml b/headscale/values.yaml index 1f68916..034e145 100644 --- a/headscale/values.yaml +++ b/headscale/values.yaml @@ -70,6 +70,7 @@ headscale: paths: [] # auto_update_enabled: true update_frequency: 24h + disable_check_updates: true prometheus: servicemonitor: