truenas/charts
1
0
Fork 0
mirror of https://ghproxy.com/https://github.com/truecharts/charts.git synced 2026-06-18 09:27:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

more vpn work

Browse Source
This commit is contained in:
Kjeld Schouten
2025-01-25 16:58:06 +01:00
parent 060dbec2a0
commit e8398eee7e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
charts/library/common/templates/addons/vpn/_vpn.tpl
View File

@@ -57,28 +57,28 @@ It will include / inject the required templates based on the given values.
{{- $container := dict -}}
{{- $containerModify := dict -}}
{{- if eq "gluetun" $.Values.addons.vpn.type -}}
{{- $container = .Values.addons.vpn.gluetun.container -}}
{{- $container = $.Values.addons.vpn.gluetun.container -}}
{{- $containerModify = include "tc.v1.common.addon.vpn.gluetun.containerModify" $ | fromYaml -}}
{{- else if eq "tailscale" $.Values.addons.vpn.type -}}
{{/* FIXME: https://github.com/tailscale/tailscale/issues/8188 */}}
{{- $_ := set $.Values.podOptions "automountServiceAccountToken" true -}}
{{- $container = .Values.addons.vpn.tailscale.container -}}
{{- $container = $.Values.addons.vpn.tailscale.container -}}
{{- $containerModify = include "tc.v1.common.addon.vpn.tailscale.containerModify" $ | fromYaml -}}
{{- else if eq "openvpn" $.Values.addons.vpn.type -}}
{{- $container = .Values.addons.vpn.openvpn.container -}}
{{- $container = $.Values.addons.vpn.openvpn.container -}}
{{- $containerModify = include "tc.v1.common.addon.vpn.openvpn.containerModify" $ | fromYaml -}}
{{- else if eq "wireguard" $.Values.addons.vpn.type -}}
{{- $container = .Values.addons.vpn.wireguard.container -}}
{{- $container = $.Values.addons.vpn.wireguard.container -}}
{{- $containerModify = include "tc.v1.common.addon.vpn.wireguard.containerModify" $ | fromYaml -}}
{{- end -}}
{{- if $container -}}
{{- if $container.enabled -}}
{{- $mergedContainer := mustMergeOverwrite $container $containerModify -}}
{{- $workload := get $.Values.workload . -}}
{{- $_ := set $workload.podSpec.containers $container $mergedContainer -}}
{{- $_ := set $workload.podSpec.containers "vpn" $mergedContainer -}}
{{- end -}}
{{- end -}}

2
charts/library/common/values.yaml
View File

@@ -835,7 +835,7 @@ addons:
# -- The common chart supports adding a VPN add-on. It can be configured under this key.
# @default -- See values.yaml
vpn:
enabled: false
enabled: true
# -- Specify the VPN type. Valid options are disabled, gluetun, openvpn, wireguard or tailscale
# OpenVPN and Wireguard are considered deprecated
type: disabled