From d8bc42df0cde1922fc3f2d8ed4b1269dcf4cdb8d Mon Sep 17 00:00:00 2001 From: Harry Owen Date: Wed, 2 May 2018 12:14:16 +0100 Subject: [PATCH] Use defaults in values.yaml (stable/mongodb) (#5340) * Use defaults in values.yaml (stable/mongodb) Also made assignments in `_helpers.tpl` more uniform * Bump version to 2.0.3 --- stable/mongodb/Chart.yaml | 2 +- stable/mongodb/templates/_helpers.tpl | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml index d418b6f280..0b87acfef7 100644 --- a/stable/mongodb/Chart.yaml +++ b/stable/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 2.0.2 +version: 2.0.3 appVersion: 3.7.3 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/stable/mongodb/templates/_helpers.tpl b/stable/mongodb/templates/_helpers.tpl index 7690127983..f862a10de1 100644 --- a/stable/mongodb/templates/_helpers.tpl +++ b/stable/mongodb/templates/_helpers.tpl @@ -19,7 +19,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Return the proper image name */}} {{- define "mongodb.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 -}}