public/helm-charts
1
0
Fork 0
mirror of https://github.com/bjw-s-labs/helm-charts.git synced 2025-07-04 00:47:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat(common): Release v2.1.0 (#221)

Browse source 
Co-authored-by: Christopher Larivière <lariviere.c@gmail.com>
This commit is contained in:
Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs 2023-11-10 15:46:55 +01:00 • committed by GitHub
parent 272dbef383
commit b360c9885a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 288 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

80
charts/library/common/templates/lib/container/fields/_env.tpl
View file

@ -7,39 +7,77 @@ Env field used by the container.
{{- $containerObject := $ctx.containerObject -}}
{{- /* Default to empty list */ -}}
{{- $env := list -}}
{{- $envList := list -}}
{{- /* See if an override is desired */ -}}
{{- if not (empty (get $containerObject "env")) -}}
{{- with $containerObject.env -}}
{{- range $name, $value := . -}}
{{- if kindIs "slice" $containerObject.env -}}
{{- /* Env is a list so we assume the order is already as desired */ -}}
{{- range $name, $var := $containerObject.env -}}
{{- if kindIs "int" $name -}}
{{- $name = required "environment variables as a list of maps require a name field" $value.name -}}
{{- $name = required "environment variables as a list of maps require a name field" $var.name -}}
{{- end -}}
{{- end -}}
{{- $envList = $containerObject.env -}}
{{- else -}}
{{- /* Env is a map so we must check if ordering is desired */ -}}
{{- $graph := dict -}}
{{- if kindIs "map" $value -}}
{{- if hasKey $value "value" -}}
{{- $envValue := $value.value | toString -}}
{{- $env = append $env (dict "name" $name "value" (tpl $envValue $rootContext)) -}}
{{- else if hasKey $value "valueFrom" -}}
{{- $env = append $env (dict "name" $name "valueFrom" $value.valueFrom) -}}
{{- range $name, $var := $containerObject.env -}}
{{- if $var -}}
{{- if kindIs "map" $var -}}
{{- /* Value is a map so ordering can be specified */ -}}
{{- if empty (dig "dependsOn" nil $var) -}}
{{- $_ := set $graph $name ( list ) -}}
{{- else if kindIs "string" $var.dependsOn -}}
{{- $_ := set $graph $name ( list $var.dependsOn ) -}}
{{- else if kindIs "slice" $var.dependsOn -}}
{{- $_ := set $graph $name $var.dependsOn -}}
{{- end -}}
{{- else -}}
{{- $env = append $env (dict "name" $name "valueFrom" $value) -}}
{{- end -}}
{{- else -}}
{{- if kindIs "string" $value -}}
{{- $env = append $env (dict "name" $name "value" (tpl $value $rootContext)) -}}
{{- else if or (kindIs "float64" $value) (kindIs "bool" $value) -}}
{{- $env = append $env (dict "name" $name "value" ($value | toString)) -}}
{{- else -}}
{{- $env = append $env (dict "name" $name "value" $value) -}}
{{- /* Value is not a map so no ordering can be specified */ -}}
{{- $_ := set $graph $name ( list ) -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $args := dict "graph" $graph "out" list -}}
{{- include "bjw-s.common.lib.kahn" $args -}}
{{- range $name := $args.out -}}
{{- $envItem := dict "name" $name -}}
{{- $envValue := get $containerObject.env $name -}}
{{- if kindIs "map" $envValue -}}
{{- $envItem := merge $envItem (omit $envValue "dependsOn") -}}
{{- else -}}
{{- $_ := set $envItem "value" $envValue -}}
{{- end -}}
{{- $envList = append $envList $envItem -}}
{{- end -}}
{{- $args = dict -}}
{{- end -}}
{{- end -}}
{{- if not (empty $env) -}}
{{- $env | toYaml -}}
{{- if not (empty $envList) -}}
{{- $output := list -}}
{{- range $envList -}}
{{- if hasKey . "value" -}}
{{- if kindIs "string" .value -}}
{{- $output = append $output (dict "name" .name "value" (tpl .value $rootContext)) -}}
{{- else if or (kindIs "float64" .value) (kindIs "bool" .value) -}}
{{- $output = append $output (dict "name" .name "value" (.value | toString)) -}}
{{- else -}}
{{- $output = append $output (dict "name" .name "value" .value) -}}
{{- end -}}
{{- else if hasKey . "valueFrom" -}}
{{- $output = append $output (dict "name" .name "valueFrom" .valueFrom) -}}
{{- else -}}
{{- $output = append $output (dict "name" .name "valueFrom" (omit . "name")) -}}
{{- end -}}
{{- end -}}
{{- $output | toYaml -}}
{{- end -}}
{{- end -}}

6
charts/library/common/templates/lib/container/fields/_probes.tpl
View file

@ -58,7 +58,11 @@ Probes used by the container.
{{- end -}}
{{- if $probeValues.port -}}
{{- $_ := set (index $probeDefinition $probeHeader) "port" (tpl ( $probeValues.port | toString ) $rootContext) -}}
{{- if kindIs "float64" $probeValues.port -}}
{{- $_ := set (index $probeDefinition $probeHeader) "port" $probeValues.port -}}
{{- else if kindIs "string" $probeValues.port -}}
{{- $_ := set (index $probeDefinition $probeHeader) "port" (tpl ( $probeValues.port | toString ) $rootContext) -}}
{{- end -}}
{{- else if $primaryServiceDefaultPort.targetPort -}}
{{- $_ := set (index $probeDefinition $probeHeader) "port" $primaryServiceDefaultPort.targetPort -}}
{{- else -}}

6
charts/library/common/templates/lib/container/fields/_volumeMounts.tpl
View file

@ -25,7 +25,7 @@ volumeMounts used by the container.
{{- end -}}
{{- /* Collect volumeClaimTemplates */ -}}
{{- if not (eq (dig "statefulset" "volumeClaimTemplates" nil $controllerObject) nil) -}}
{{- if not (empty (dig "statefulset" "volumeClaimTemplates" nil $controllerObject)) -}}
{{- range $persistenceValues := $controllerObject.statefulset.volumeClaimTemplates -}}
{{- /* Enable persistence item by default, but allow override */ -}}
{{- $persistenceEnabled := true -}}
@ -35,10 +35,10 @@ volumeMounts used by the container.
{{- if $persistenceEnabled -}}
{{- $mountValues := dict -}}
{{- if not (eq (dig "globalMounts" nil $persistenceValues) nil) -}}
{{- if not (empty (dig "globalMounts" nil $persistenceValues)) -}}
{{- $_ := set $mountValues "globalMounts" $persistenceValues.globalMounts -}}
{{- end -}}
{{- if not (eq (dig "advancedMounts" nil $persistenceValues) nil) -}}
{{- if not (empty (dig "advancedMounts" nil $persistenceValues)) -}}
{{- $_ := set $mountValues "advancedMounts" (dict $controllerObject.identifier $persistenceValues.advancedMounts) -}}
{{- end -}}
{{- $_ := set $persistenceItemsToProcess $persistenceValues.name $mountValues -}}