mirror of
https://github.com/bjw-s-labs/helm-charts.git
synced 2025-07-04 08:57:04 +02:00
feat(common): Release common 4.0.0 (#398)
Co-authored-by: lab-assistant[bot] <180935599+lab-assistant[bot]@users.noreply.github.com>
This commit is contained in:
parent
1e210f43e3
commit
a01a89cb13
327 changed files with 11181 additions and 7330 deletions
|
@ -6,9 +6,10 @@ Returns the value for the specified field
|
|||
{{- $controllerObject := .ctx.controllerObject -}}
|
||||
{{- $option := .option -}}
|
||||
{{- $default := default "" .default -}}
|
||||
|
||||
{{- $value := $default -}}
|
||||
|
||||
{{- $defaultPodOptionsStrategy := dig "defaultPodOptionsStrategy" "overwrite" $rootContext.Values -}}
|
||||
|
||||
{{- /* Set to the default if it is set */ -}}
|
||||
{{- $defaultOption := dig $option nil (default dict $rootContext.Values.defaultPodOptions) -}}
|
||||
{{- if kindIs "bool" $defaultOption -}}
|
||||
|
@ -19,8 +20,15 @@ Returns the value for the specified field
|
|||
|
||||
{{- /* See if a pod-specific override is needed */ -}}
|
||||
{{- $podOption := dig $option nil (default dict $controllerObject.pod) -}}
|
||||
|
||||
{{- if kindIs "bool" $podOption -}}
|
||||
{{- $value = $podOption -}}
|
||||
{{- else if kindIs "map" $podOption -}}
|
||||
{{- if eq "merge" $defaultPodOptionsStrategy -}}
|
||||
{{- $value = merge $podOption $value -}}
|
||||
{{- else if eq "overwrite" $defaultPodOptionsStrategy -}}
|
||||
{{- $value = $podOption -}}
|
||||
{{- end -}}
|
||||
{{- else if not (empty $podOption) -}}
|
||||
{{- $value = $podOption -}}
|
||||
{{- end -}}
|
||||
|
|
|
@ -48,6 +48,11 @@ imagePullSecrets: {{ . | nindent 2 }}
|
|||
{{- with (include "bjw-s.common.lib.pod.getOption" (dict "ctx" $ctx "option" "terminationGracePeriodSeconds")) }}
|
||||
terminationGracePeriodSeconds: {{ . | trim }}
|
||||
{{- end -}}
|
||||
{{- if ge ($rootContext.Capabilities.KubeVersion.Minor | int) 32 }}
|
||||
{{- with (include "bjw-s.common.lib.pod.getOption" (dict "ctx" $ctx "option" "resources")) }}
|
||||
resources: {{ . | nindent 2 }}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- with (include "bjw-s.common.lib.pod.getOption" (dict "ctx" $ctx "option" "restartPolicy")) }}
|
||||
restartPolicy: {{ . | trim }}
|
||||
{{- end -}}
|
||||
|
|
|
@ -4,24 +4,20 @@ Returns the value for serviceAccountName
|
|||
{{- define "bjw-s.common.lib.pod.field.serviceAccountName" -}}
|
||||
{{- $rootContext := .ctx.rootContext -}}
|
||||
{{- $controllerObject := .ctx.controllerObject -}}
|
||||
|
||||
{{- $serviceAccountName := "default" -}}
|
||||
|
||||
{{- if $rootContext.Values.enforceServiceAccountCreation -}}
|
||||
{{- if (get (include "bjw-s.common.lib.serviceAccount.getByIdentifier" (dict "rootContext" $rootContext "id" "default") | fromYaml) "create") -}}
|
||||
{{- $serviceAccountName = get (include "bjw-s.common.lib.serviceAccount.getByIdentifier" (dict "rootContext" $rootContext "id" "default") | fromYaml) "name" -}}
|
||||
{{- end -}}
|
||||
{{- else -}}
|
||||
{{- $serviceAccountName = get (include "bjw-s.common.lib.serviceAccount.getByIdentifier" (dict "rootContext" $rootContext "id" "default") | fromYaml) "name" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- with $controllerObject.serviceAccount -}}
|
||||
{{- if hasKey . "identifier" -}}
|
||||
{{- $serviceAccountName = get (include "bjw-s.common.lib.serviceAccount.getByIdentifier" (dict "rootContext" $rootContext "id" .identifier) | fromYaml) "name" -}}
|
||||
{{- $subject := (include "bjw-s.common.lib.serviceAccount.getByIdentifier" (dict "rootContext" $rootContext "id" .identifier) | fromYaml) -}}
|
||||
|
||||
{{- if not $subject }}
|
||||
{{- fail (printf "No enabled ServiceAccount found with this identifier. (controller: '%s', identifier: '%s')" $controllerObject.identifier .identifier) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- $serviceAccountName = get $subject "name" -}}
|
||||
{{- else if hasKey . "name" -}}
|
||||
{{- $serviceAccountName = .name -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- $serviceAccountName -}}
|
||||
|
||||
{{- end -}}
|
||||
|
|
|
@ -46,15 +46,8 @@ Returns the value for volumes
|
|||
{{- $pvcName = $persistenceValues.existingClaim -}}
|
||||
{{- else -}}
|
||||
{{- /* Otherwise refer to the PVC name */ -}}
|
||||
{{- if $persistenceValues.nameOverride -}}
|
||||
{{- if not (eq $persistenceValues.nameOverride "-") -}}
|
||||
{{- $pvcName = (printf "%s-%s" (include "bjw-s.common.lib.chart.names.fullname" $rootContext) $persistenceValues.nameOverride) -}}
|
||||
{{- end -}}
|
||||
{{- else -}}
|
||||
{{- if not (eq $pvcName $identifier) -}}
|
||||
{{- $pvcName = (printf "%s-%s" (include "bjw-s.common.lib.chart.names.fullname" $rootContext) $identifier) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- $object := (include "bjw-s.common.lib.pvc.getByIdentifier" (dict "rootContext" $rootContext "id" $identifier) | fromYaml) -}}
|
||||
{{- $pvcName = get $object "name" -}}
|
||||
{{- end -}}
|
||||
{{- $_ := set $volume "persistentVolumeClaim" (dict "claimName" $pvcName) -}}
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ Returns the value for labels
|
|||
|
||||
{{- /* Default labels */ -}}
|
||||
{{- $labels := merge
|
||||
(dict "app.kubernetes.io/component" $controllerObject.identifier)
|
||||
(dict "app.kubernetes.io/controller" $controllerObject.identifier)
|
||||
-}}
|
||||
|
||||
{{- /* Include global labels if specified */ -}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue