master-group/charts
2
0
Fork 0
mirror of https://github.com/k8s-at-home/charts.git synced 2025-01-24 16:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media-common-openvpn] Fix auth syntax, indenting (#56)

Browse Source
This commit is contained in:
Bernd Schörgers 2020-09-21 20:57:55 +02:00 committed by GitHub
parent fb1c653533
commit bc2742e655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/media-common-openvpn/Chart.yaml
View File

@ -4,8 +4,9 @@ description: OpenVPN add-on for `media-common`-based charts
type: library type: library
keywords: keywords:
- media-common - media-common
- openvpn
home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common-openvpn home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common-openvpn
maintainers: maintainers:
- name: bjw-s - name: bjw-s
email: bjw-s@users.noreply.github.com email: bjw-s@users.noreply.github.com
version: 1.0.0 version: 1.0.1

50
charts/media-common-openvpn/templates/_container.tpl
View File

@ -10,41 +10,39 @@ The OpenVPN container(s) to be inserted
add: ["NET_ADMIN"] add: ["NET_ADMIN"]
{{- if .Values.openvpn.env }} {{- if .Values.openvpn.env }}
env: env:
{{- if .Values.openvpn.env }}
{{- range $k, $v := .Values.openvpn.env }} {{- range $k, $v := .Values.openvpn.env }}
- name: {{ $k }} - name: {{ $k }}
value: {{ $v }} value: {{ $v }}
{{- end }} {{- end }}
{{- end }} {{- end }}
envFrom: envFrom:
{{- if or .Values.openvpn.auth .Values.openvpn.authSecret }} {{- if or .Values.openvpn.auth .Values.openvpn.authSecret }}
- secretRef: - secretRef:
{{- if .Values.openvpn.authSecret }} {{- if .Values.openvpn.authSecret }}
name: {{ .Values.openvpn.authSecret }} name: {{ .Values.openvpn.authSecret }}
{{- else }} {{- else }}
name: {{ template "media-common.fullname" . }}-openvpn name: {{ template "media-common.fullname" . }}-openvpn
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
{{- if .Values.openvpn.vpnConf }} {{- if .Values.openvpn.vpnConf }}
- name: openvpnconf - name: openvpnconf
mountPath: /vpn/vpn.conf mountPath: /vpn/vpn.conf
subPath: vpnConf subPath: vpnConf
{{- end }} {{- end }}
{{- if .Values.openvpn.scripts.up }} {{- if .Values.openvpn.scripts.up }}
- name: openvpnconf - name: openvpnconf
mountPath: /vpn/up.sh mountPath: /vpn/up.sh
subPath: up.sh subPath: up.sh
{{- end }} {{- end }}
{{- if .Values.openvpn.scripts.down }} {{- if .Values.openvpn.scripts.down }}
- name: openvpnconf - name: openvpnconf
mountPath: /vpn/down.sh mountPath: /vpn/down.sh
subPath: down.sh subPath: down.sh
{{- end }} {{- end }}
{{- if .Values.openvpn.additionalVolumeMounts }} {{- if .Values.openvpn.additionalVolumeMounts }}
{{- toYaml .Values.openvpn.additionalVolumeMounts | nindent 4 }} {{- toYaml .Values.openvpn.additionalVolumeMounts | nindent 2 }}
{{- end }} {{- end }}
livenessProbe: livenessProbe:
{{- toYaml .Values.openvpn.livenessProbe | nindent 4 }} {{- toYaml .Values.openvpn.livenessProbe | nindent 4 }}
{{- end -}} {{- end -}}