truenas/chart
1
0
Fork 0
mirror of https://github.com/truenas/charts.git synced 2026-04-09 05:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add method to render all volumes/env variables

Browse Source
This commit is contained in:
Waqar Ahmed
2021-02-02 17:50:13 +05:00
parent 88bda7e5e9
commit 502e700103
2 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/common/2101.0.0/templates/lib/containers/_environment.tpl
View File

@@ -28,3 +28,14 @@ Render environment variables
{{- include "common.containers.environmentVariable" $envVariable | nindent 0 -}}
{{- end -}}
{{- end -}}
{{/*
Render environment variables if present
*/}}
{{- define "common.containers.allEnvironmentVariables" -}}
{{- $values := . -}}
{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "environmentVariables")) -}}
{{- if $values.environmentVariables -}}
env: {{- include "common.containers.environmentVariables" $values | nindent 2 -}}
{{- end -}}
{{- end -}}

39
library/common/2101.0.0/templates/lib/storage/_appStorage.tpl
View File

@@ -2,8 +2,10 @@
Define appVolumeMounts for container
*/}}
{{- define "common.storage.configureAppVolumeMountsInContainer" -}}
{{- if and .Values.appVolumesEnabled .Values.appVolumeMounts }}
{{- range $name, $avm := .Values.appVolumeMounts -}}
{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "appVolumeMounts")) -}}
{{- $appVolumeMounts := .appVolumeMounts -}}
{{- if $appVolumeMounts }}
{{- range $name, $avm := $appVolumeMounts -}}
{{- if (default true $avm.enabled) }}
{{- if $avm.containerNameOverride -}}
{{- $name = $avm.containerNameOverride -}}
@@ -23,19 +25,22 @@ Define appVolumeMounts for container
Define hostPath for appVolumes
*/}}
{{- define "common.storage.configureAppVolumes" -}}
{{- if .Values.appVolumeMounts }}
{{- range $name, $av := .Values.appVolumeMounts -}}
{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "appVolumeMounts")) -}}
{{- $appVolumeMounts := .appVolumeMounts -}}
{{- if $appVolumeMounts }}
{{- range $name, $av := $appVolumeMounts -}}
{{- if (default true $av.enabled) }}
- name: {{ $name }}
{{- if or $av.emptyDir $.Values.emptyDirVolumes }}
{{- if or $av.emptyDir $.emptyDirVolumes }}
emptyDir: {}
{{- else }}
hostPath:
{{ if $av.hostPathEnabled }}
path: {{ required "hostPath not set" $av.hostPath }}
{{- else }}
{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "ixVolumes")) -}}
{{- include "common.schema.validateKeys" (dict "values" $av "checkKeys" (list "datasetName")) -}}
{{- $volDict := dict "datasetName" $av.datasetName "ixVolumes" $.Values.ixVolumes -}}
{{- $volDict := dict "datasetName" $av.datasetName "ixVolumes" $.ixVolumes -}}
path: {{ include "common.storage.retrieveHostPathFromiXVolume" $volDict }}
{{- end }}
{{- end }}
@@ -43,3 +48,25 @@ Define hostPath for appVolumes
{{- end }}
{{- end }}
{{- end -}}
{{/*
Get all volumes configuration
*/}}
{{- define "common.storage.allAppVolumes" -}}
{{- $appVolumeMounts := .appVolumeMounts -}}
{{- if $appVolumeMounts -}}
volumes: {{- include "common.storage.configureAppVolumes" . | nindent 2 -}}
{{- end -}}
{{- end -}}
{{/*
Get all container volume moutns configuration
*/}}
{{- define "common.storage.allContainerVolumeMounts" -}}
{{- $appVolumeMounts := .appVolumeMounts -}}
{{- if $appVolumeMounts -}}
volumeMounts: {{- include "common.storage.configureAppVolumeMountsInContainer" . | nindent 2 -}}
{{- end -}}
{{- end -}}