DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases 1 Wiki Activity

fix: remove old configmap and secret references for VPN config/scripts

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-09-12 22:10:48 +02:00
parent 31b4d949f5
commit b34f57e386
5 changed files with 6 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -18,4 +18,4 @@ maintainers:
name: common
sources: null
type: library
version: 7.0.7
version: 7.0.9
charts/library/common/templates/addons/vpn/_volume.tpl
-37
View File
@@ -1,37 +0,0 @@
{{/*
The volume (referencing VPN scripts) to be inserted into additionalVolumes.
*/}}
{{- define "common.addon.vpn.scriptsVolumeSpec" -}}
{{- if or .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down -}}
configMap:
name: {{ include "common.names.fullname" . }}-vpn
items:
{{- if .Values.addons.vpn.scripts.up }}
- key: up.sh
path: up.sh
mode: 0777
{{- end }}
{{- if .Values.addons.vpn.scripts.down }}
- key: down.sh
path: down.sh
mode: 0777
{{- end }}
{{- end -}}
{{- end -}}
{{/*
The volume (referencing VPN config) to be inserted into additionalVolumes.
*/}}
{{- define "common.addon.vpn.configVolumeSpec" -}}
{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.configFileSecret -}}
secret:
{{- if .Values.addons.vpn.configFileSecret }}
secretName: {{ .Values.addons.vpn.configFileSecret }}
{{- else }}
secretName: {{ include "common.names.fullname" . }}-vpnconfig
{{- end }}
items:
- key: vpnConfigfile
path: vpnConfigfile
{{- end -}}
{{- end -}}
charts/library/common/templates/addons/vpn/_vpn.tpl
+1 -12
View File
@@ -18,19 +18,8 @@ It will include / inject the required templates based on the given values.
{{- $configmap | nindent 0 -}}
{{- end -}}
{{- $_ := set .Values.persistence "vpnConfig" .Values.addons.vpn.configFile -}}
{{- $_ := set .Values.persistence "vpnconfig" .Values.addons.vpn.configFile -}}
{{/* Append the vpn scripts volume to the volumes */}}
{{- $scriptVolume := include "common.addon.vpn.scriptsVolumeSpec" . | fromYaml -}}
{{- if $scriptVolume -}}
{{- $_ := set .Values.persistence "vpnscript" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $scriptVolume) -}}
{{- end -}}
{{/* Append the vpn config volume to the volumes */}}
{{- $configVolume := include "common.addon.vpn.configVolumeSpec" . | fromYaml }}
{{ if $configVolume -}}
{{- $_ := set .Values.persistence "vpnconfig" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $configVolume) -}}
{{- end -}}
{{- end -}}
{{- end -}}
charts/library/common/templates/addons/vpn/openvpn/_container.tpl
+2 -5
View File
@@ -37,12 +37,12 @@ envFrom:
name: {{ include "common.names.fullname" . }}-openvpn
{{- end }}
{{- end }}
{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down .Values.addons.vpn.additionalVolumeMounts .Values.persistence.shared.enabled }}
volumeMounts:
- mountPath: {{ .Values.persistence.shared.mountPath }}
name: shared
{{- if or .Values.addons.vpn.configFile }}
- name: vpnconfig
mountPath: /vpn/vpn.conf
subPath: vpnConfigfile
{{- end }}
{{- if .Values.addons.vpn.scripts.up }}
- name: vpnscript
@@ -53,9 +53,6 @@ volumeMounts:
- name: vpnscript
mountPath: /vpn/down.sh
subPath: down.sh
{{- end }}
- mountPath: {{ .Values.persistence.shared.mountPath }}
name: shared
{{- end }}
{{- with .Values.addons.vpn.livenessProbe }}
livenessProbe:
charts/library/common/templates/addons/vpn/wireguard/_container.tpl
+2 -5
View File
@@ -45,12 +45,12 @@ env:
{{- end }}
{{- end }}
{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down .Values.addons.vpn.additionalVolumeMounts .Values.persistence.shared.enabled }}
volumeMounts:
- mountPath: {{ .Values.persistence.shared.mountPath }}
name: shared
{{- if or .Values.addons.vpn.configFile }}
- name: vpnconfig
mountPath: /etc/wireguard/wg0.conf
subPath: vpnConfigfile
{{- end }}
{{- if .Values.addons.vpn.scripts.up }}
- name: vpnscript
@@ -61,9 +61,6 @@ volumeMounts:
- name: vpnscript
mountPath: /config/down.sh
subPath: down.sh
{{- end }}
- mountPath: {{ .Values.persistence.shared.mountPath }}
name: shared
{{- end }}
{{- with .Values.addons.vpn.livenessProbe }}
livenessProbe: