diff options
| -rw-r--r-- | k8s/charts/seaweedfs/templates/shared/_helpers.tpl | 9 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/values.yaml | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/k8s/charts/seaweedfs/templates/shared/_helpers.tpl b/k8s/charts/seaweedfs/templates/shared/_helpers.tpl index b15b07fa0..404981976 100644 --- a/k8s/charts/seaweedfs/templates/shared/_helpers.tpl +++ b/k8s/charts/seaweedfs/templates/shared/_helpers.tpl @@ -96,13 +96,16 @@ Inject extra environment vars in the format key:value, if populated {{/* Computes the container image name for all components (if they are not overridden) */}} {{- define "common.image" -}} {{- $registryName := default .Values.image.registry .Values.global.registry | toString -}} -{{- $repositoryName := .Values.image.repository | toString -}} +{{- $repositoryName := default .Values.image.repository .Values.global.repository | toString -}} {{- $name := .Values.global.imageName | toString -}} {{- $tag := default .Chart.AppVersion .Values.image.tag | toString -}} +{{- if $repositoryName -}} +{{- $name = printf "%s/%s" (trimSuffix "/" $repositoryName) (base $name) -}} +{{- end -}} {{- if $registryName -}} -{{- printf "%s/%s%s:%s" $registryName $repositoryName $name $tag -}} +{{- printf "%s/%s:%s" $registryName $name $tag -}} {{- else -}} -{{- printf "%s%s:%s" $repositoryName $name $tag -}} +{{- printf "%s:%s" $name $tag -}} {{- end -}} {{- end -}} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 351cb966d..a0c2066a0 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -3,6 +3,7 @@ global: createClusterRole: true registry: "" + # if repository is set, it overrides the namespace part of imageName repository: "" imageName: chrislusf/seaweedfs imagePullPolicy: IfNotPresent |