fix(headscale)!: update to v0.23.0 with breaking changes
This commit is contained in:
parent
330095207e
commit
b626678907
GPG key ID:
7AFDB012974B1BB5
5 changed files with 56 additions and 49 deletions
|
|
@ -3,9 +3,9 @@ name: headscale-ui
|
|||
description: A simple Headscale web UI for small-scale deployments.
|
||||
icon: https://raw.githubusercontent.com/gurucomputing/headscale-ui/master/static/favicon.png
|
||||
type: application
|
||||
version: 0.2.0
|
||||
version: 0.2.1
|
||||
# renovate: image=ghcr.io/gurucomputing/headscale-ui
|
||||
appVersion: "2024.02.24-beta1"
|
||||
appVersion: "2024.10.10"
|
||||
maintainers:
|
||||
- name: WrenIX
|
||||
url: https://wrenix.eu
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ 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.4.0
|
||||
# renovate: image=docker.io/headscale/headscale
|
||||
appVersion: "0.22.3"
|
||||
version: 1.0.0
|
||||
# renovate: image=ghcr.io/headscale/headscale
|
||||
appVersion: "0.23.0"
|
||||
maintainers:
|
||||
- name: WrenIX
|
||||
url: https://wrenix.eu
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ spec:
|
|||
{{- end }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
args:
|
||||
- "headscale"
|
||||
- "serve"
|
||||
ports:
|
||||
- name: http
|
||||
|
|
|
|||
|
|
@ -76,6 +76,28 @@ spec:
|
|||
spec:
|
||||
restartPolicy: "Never"
|
||||
serviceAccount: {{ $name }}
|
||||
initContainers:
|
||||
- name: generate-key
|
||||
{{- with .Values.image }}
|
||||
image: "{{ .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}-debug"
|
||||
{{- end }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- |
|
||||
set -e
|
||||
echo "generate private-keys"
|
||||
headscale generate private-key --output json > /etc/headscale/secrets/wireguard.json
|
||||
headscale generate private-key --output json > /etc/headscale/secrets/noise.json
|
||||
headscale generate private-key --output json > /etc/headscale/secrets/derp.json
|
||||
ls /etc/headscale/secrets/
|
||||
volumeMounts:
|
||||
- name: config
|
||||
mountPath: "/etc/headscale"
|
||||
readOnly: true
|
||||
- mountPath: "/etc/headscale/secrets"
|
||||
name: secrets
|
||||
containers:
|
||||
- name: upload-key
|
||||
image: bitnami/kubectl
|
||||
|
|
@ -84,43 +106,26 @@ spec:
|
|||
- -c
|
||||
- |
|
||||
# check if key already exists
|
||||
key=$(kubectl get secret {{ $secretName }} -o jsonpath="{.data['wireguard.key']}" 2> /dev/null)
|
||||
key=$(kubectl get secret {{ $secretName }} -o jsonpath="{.data}" 2> /dev/null)
|
||||
[ $? -ne 0 ] && echo "Failed to get existing secret" && exit 1
|
||||
[ -n "$key" ] && echo "Key already created, exiting." && exit 0
|
||||
# wait for wireguard key
|
||||
while [ ! -f /etc/headscale/secrets/wireguard.key ]; do
|
||||
echo "Waiting for wireguard key.."
|
||||
sleep 5;
|
||||
done
|
||||
# update secret
|
||||
kubectl patch secret {{ $secretName }} -p "{\"data\":{\"wireguard.key\":\"$(base64 /etc/headscale/secrets/wireguard.key | tr -d '\n')\"}}"
|
||||
kubectl patch secret {{ $secretName }} -p "{\"data\":{\"noise.key\":\"$(base64 /etc/headscale/secrets/noise.key | tr -d '\n')\"}}"
|
||||
if ! echo $key | jq -e 'has("wireguard.key")' 2> /dev/null ; then
|
||||
echo "store wireguard.key"
|
||||
kubectl patch secret {{ $secretName }} -p "{\"data\":{\"wireguard.key\":\"$(jq -r '.["private_key"] | split(":")[1] | @base64' /etc/headscale/secrets/wireguard.json)\"}}"
|
||||
fi
|
||||
if ! echo $key | jq -e 'has("noise.key")' 2> /dev/null ; then
|
||||
echo "store noise.key"
|
||||
kubectl patch secret {{ $secretName }} -p "{\"data\":{\"noise.key\":\"$(jq -r '.["private_key"] | split(":")[1] | @base64' /etc/headscale/secrets/noise.json)\"}}"
|
||||
fi
|
||||
if ! echo $key | jq -e 'has("derp.key")' 2> /dev/null ; then
|
||||
echo "store derp.key"
|
||||
kubectl patch secret {{ $secretName }} -p "{\"data\":{\"derp.key\":\"$(jq -r '.["private_key"] | split(":")[1] | @base64' /etc/headscale/secrets/derp.json)\"}}"
|
||||
fi
|
||||
[ $? -ne 0 ] && echo "Failed to update secret." && exit 1
|
||||
echo "Signing key successfully created."
|
||||
volumeMounts:
|
||||
- mountPath: /etc/headscale/secrets
|
||||
name: secrets
|
||||
readOnly: true
|
||||
- name: generate-key
|
||||
{{- with .Values.image }}
|
||||
image: "{{ .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
|
||||
{{- end }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- |
|
||||
set -e
|
||||
/bin/headscale generate private-key | tail -1 | sed 's/privkey://' > /etc/headscale/secrets/wireguard.key
|
||||
chown 1001:1001 /etc/headscale/secrets/wireguard.key
|
||||
/bin/headscale generate private-key | tail -1 | sed 's/privkey://' > /etc/headscale/secrets/noise.key
|
||||
chown 1001:1001 /etc/headscale/secrets/noise.key
|
||||
volumeMounts:
|
||||
- name: config
|
||||
mountPath: "/etc/headscale"
|
||||
readOnly: true
|
||||
- mountPath: "/etc/headscale/secrets"
|
||||
name: secrets
|
||||
volumes:
|
||||
- name: config
|
||||
secret:
|
||||
|
|
|
|||
|
|
@ -38,19 +38,17 @@ headscale:
|
|||
server_url: http://127.0.0.1:8080
|
||||
|
||||
# SQLite config
|
||||
db_type: sqlite3
|
||||
|
||||
# For production:
|
||||
db_path: /var/lib/headscale/db.sqlite
|
||||
|
||||
# # Postgres config
|
||||
# If using a Unix socket to connect to Postgres, set the socket path in the 'host' field and leave 'port' blank.
|
||||
# db_type: postgres
|
||||
# db_host: localhost
|
||||
# db_port: 5432
|
||||
# db_name: headscale
|
||||
# db_user: foo
|
||||
# db_pass: bar
|
||||
database:
|
||||
type: sqlite
|
||||
sqlite:
|
||||
# For production:
|
||||
path: /var/lib/headscale/db.sqlite
|
||||
postgres:
|
||||
host: localhost
|
||||
port: 5432
|
||||
name: headscale
|
||||
user: foo
|
||||
pass: bar
|
||||
private_key_path: "/etc/headscale/secrets/wireguard.key"
|
||||
noise:
|
||||
private_key_path: "/etc/headscale/secrets/noise.key"
|
||||
|
|
@ -59,6 +57,10 @@ headscale:
|
|||
## Use already defined certificates:
|
||||
tls_cert_path: "/etc/headscale/certs/tls.crt"
|
||||
tls_key_path: "/etc/headscale/certs/tls.key"
|
||||
prefixes:
|
||||
v6: fd7a:115c:a1e0::/48
|
||||
v4: 100.64.0.0/10
|
||||
allocation: sequential
|
||||
derp:
|
||||
server:
|
||||
enabled: true
|
||||
|
|
@ -66,6 +68,7 @@ headscale:
|
|||
region_code: "headscale"
|
||||
region_name: "Headscale Embedded DERP"
|
||||
stun_listen_addr: "0.0.0.0:3478"
|
||||
private_key_path: "/etc/headscale/secrets/derp.key"
|
||||
urls: []
|
||||
# - https://controlplane.tailscale.com/derpmap/default
|
||||
paths: []
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue