mirror of
https://github.com/bjw-s-labs/helm-charts.git
synced 2025-07-04 00:47:04 +02:00
feat(common): Release v2.4.0 (#245)
Signed-off-by: Christopher Larivière <lariviere.c@gmail.com> Co-authored-by: Christopher Larivière <lariviere.c@gmail.com> Co-authored-by: Markus Reiter <me@reitermark.us>
This commit is contained in:
parent
44b1665b61
commit
3d3028b889
30 changed files with 364 additions and 61 deletions
|
@ -17,6 +17,9 @@ command: {{ . | trim | nindent 2 }}
|
|||
{{- end -}}
|
||||
{{- with (include "bjw-s.common.lib.container.field.args" (dict "ctx" $ctx) | trim) }}
|
||||
args: {{ . | trim | nindent 2 }}
|
||||
{{- end -}}
|
||||
{{- with $containerObject.workingDir }}
|
||||
workingDir: {{ . | trim }}
|
||||
{{- end -}}
|
||||
{{- with $containerObject.securityContext }}
|
||||
securityContext: {{ toYaml . | trim | nindent 2 }}
|
||||
|
|
|
@ -8,12 +8,18 @@ Convert container values to an object
|
|||
|
||||
{{- $_ := set $objectValues "identifier" $identifier -}}
|
||||
|
||||
{{- /* Convert float64 image tags to string */ -}}
|
||||
{{- /* Process image tags */ -}}
|
||||
{{- if kindIs "map" $objectValues.image -}}
|
||||
{{- $imageTag := dig "image" "tag" "" $objectValues -}}
|
||||
{{- /* Convert float64 image tags to string */ -}}
|
||||
{{- if kindIs "float64" $imageTag -}}
|
||||
{{- $_ := set $objectValues.image "tag" ($imageTag | toString) -}}
|
||||
{{- $imageTag = $imageTag | toString -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- /* Process any templates in the tag */ -}}
|
||||
{{- $imageTag = tpl $imageTag $rootContext -}}
|
||||
|
||||
{{- $_ := set $objectValues.image "tag" $imageTag -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- /* Return the container object */ -}}
|
||||
|
|
|
@ -7,7 +7,7 @@ Image used by the container.
|
|||
{{- $containerObject := $ctx.containerObject -}}
|
||||
|
||||
{{- $imageRepo := $containerObject.image.repository -}}
|
||||
{{- $imageTag := default $rootContext.Chart.AppVersion $containerObject.image.tag -}}
|
||||
{{- $imageTag := $containerObject.image.tag -}}
|
||||
|
||||
{{- if and $imageRepo $imageTag -}}
|
||||
{{- printf "%s:%s" $imageRepo $imageTag -}}
|
||||
|
|
|
@ -19,7 +19,7 @@ Returns the value for containers
|
|||
|
||||
{{- range $key, $containerValues := $enabledContainers -}}
|
||||
{{- /* Create object from the container values */ -}}
|
||||
{{- $containerObject := (include "bjw-s.common.lib.container.valuesToObject" (dict "rootContext" $ "id" $key "values" $containerValues)) | fromYaml -}}
|
||||
{{- $containerObject := (include "bjw-s.common.lib.container.valuesToObject" (dict "rootContext" $rootContext "id" $key "values" $containerValues)) | fromYaml -}}
|
||||
|
||||
{{- /* Perform validations on the Container before rendering */ -}}
|
||||
{{- include "bjw-s.common.lib.container.validate" (dict "rootContext" $ "controllerObject" $controllerObject "containerObject" $containerObject) -}}
|
||||
|
|
|
@ -25,7 +25,7 @@ Returns the value for initContainers
|
|||
|
||||
{{- if $containerEnabled -}}
|
||||
{{- /* Create object from the container values */ -}}
|
||||
{{- $containerObject := (include "bjw-s.common.lib.container.valuesToObject" (dict "rootContext" $ "id" $key "values" $containerValues)) | fromYaml -}}
|
||||
{{- $containerObject := (include "bjw-s.common.lib.container.valuesToObject" (dict "rootContext" $rootContext "id" $key "values" $containerValues)) | fromYaml -}}
|
||||
|
||||
{{- /* Perform validations on the Container before rendering */ -}}
|
||||
{{- include "bjw-s.common.lib.container.validate" (dict "rootContext" $ "controllerObject" $controllerObject "containerObject" $containerObject) -}}
|
||||
|
|
|
@ -3,5 +3,23 @@ Validate Route values
|
|||
*/}}
|
||||
{{- define "bjw-s.common.lib.route.validate" -}}
|
||||
{{- $rootContext := .rootContext -}}
|
||||
{{- $routeValues := .object -}}
|
||||
{{- $routeObject := .object -}}
|
||||
|
||||
{{/* Route Types */}}
|
||||
{{- $routeKind := $routeObject.kind | default "HTTPRoute"}}
|
||||
{{- if and (ne $routeKind "GRPCRoute") (ne $routeKind "HTTPRoute") (ne $routeKind "TCPRoute") (ne $routeKind "TLSRoute") (ne $routeKind "UDPRoute") }}
|
||||
{{- fail (printf "Not a valid route kind (%s)" $routeKind) }}
|
||||
{{- end }}
|
||||
|
||||
{{/* Route Rules */}}
|
||||
|
||||
{{- range $routeObject.rules }}
|
||||
{{- if and (.filters) (.backendRefs) }}
|
||||
{{- range .filters }}
|
||||
{{- if eq .type "RequestRedirect" }}
|
||||
{{- fail (printf "backend refs and request redirect filters cannot co-exist.")}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
|
|
@ -40,7 +40,7 @@ VolumeClaimTemplates for StatefulSet
|
|||
{{- /* Default to empty list */ -}}
|
||||
{{- $volumeClaimTemplates := list -}}
|
||||
|
||||
{{- range $index, $volumeClaimTemplate := $statefulsetObject.statefulset.volumeClaimTemplates }}
|
||||
{{- range $index, $volumeClaimTemplate := (dig "statefulset" "volumeClaimTemplates" list $statefulsetObject) }}
|
||||
{{- $vct := include "bjw-s.common.lib.statefulset.volumeclaimtemplate" (dict "rootContext" $rootContext "values" $volumeClaimTemplate) -}}
|
||||
{{- $volumeClaimTemplates = append $volumeClaimTemplates ($vct | fromYaml) -}}
|
||||
{{- end -}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue