feat: support inline tag in image.repository for jupyterlab chart
Allow repository field to include a tag (e.g. "repo:tag"), in which case the tag field is ignored. Update docs and custom-values to reflect the new behavior and add dshm volume notes.
This commit is contained in:
@@ -54,13 +54,29 @@ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Full image reference: [registry/]repository:tag
|
||||
Full image reference: [registry/]repository[:tag]
|
||||
If repository already contains a tag (e.g. "repo:tag"), tag field is ignored.
|
||||
*/}}
|
||||
{{- define "jupyterlab.image" -}}
|
||||
{{- $repo := .Values.image.repository }}
|
||||
{{- $tag := .Values.image.tag }}
|
||||
{{- $hasTag := contains ":" $repo }}
|
||||
{{- if .Values.image.registry }}
|
||||
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.tag }}
|
||||
{{- if $hasTag }}
|
||||
{{- printf "%s/%s" .Values.image.registry $repo }}
|
||||
{{- else if $tag }}
|
||||
{{- printf "%s/%s:%s" .Values.image.registry $repo $tag }}
|
||||
{{- else }}
|
||||
{{- printf "%s:%s" .Values.image.repository .Values.image.tag }}
|
||||
{{- printf "%s/%s" .Values.image.registry $repo }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{- if $hasTag }}
|
||||
{{- $repo }}
|
||||
{{- else if $tag }}
|
||||
{{- printf "%s:%s" $repo $tag }}
|
||||
{{- else }}
|
||||
{{- $repo }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user