[stable/redis]Fix registryName (#5367)

* Fix image.registry

* Increase chart version

* remove defaults from image helpers
This commit is contained in:
bhack
2018-05-03 07:25:51 -07:00
committed by k8s-ci-robot
parent 9667722aba
commit dc24d65487
2 changed files with 9 additions and 7 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: redis
version: 3.0.5
version: 3.0.6
appVersion: 4.0.9
description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
keywords:
+8 -6
View File
@@ -46,18 +46,20 @@ Return the appropriate apiVersion for networkpolicy.
Return the proper image name
*/}}
{{- define "redis.image" -}}
{{- $registryName := default .Values.image.registry "docker.io" -}}
{{- $tag := .Values.image.tag | default "latest" -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*
Return the proper image name (for the metrics image)
*/}}
{{- define "metrics.image" -}}
{{- $registryName := default .Values.metrics.image.registry "docker.io" -}}
{{- $tag := .Values.metrics.image.tag | default "latest" -}}
{{- printf "%s/%s:%s" $registryName .Values.metrics.image.repository $tag -}}
{{- $registryName := .Values.metrics.image.registry -}}
{{- $repositoryName := .Values.metrics.image.repository -}}
{{- $tag := .Values.metrics.image.tag -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*