Fix podinfo helm tests

fluxcd · Feb 10, 2019 · 7105794 · 7105794
1 parent a74ad52
commit 7105794
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/charts/podinfo/templates/_helpers.tpl b/charts/podinfo/templates/_helpers.tpl
@@ -31,3 +31,13 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create chart name suffix.
+*/}}
+{{- define "podinfo.suffix" -}}
+{{- if .Values.canary.enabled -}}
+{{- "-primary" -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/podinfo/templates/tests/test-config.yaml b/charts/podinfo/templates/tests/test-config.yaml
@@ -1,8 +1,4 @@
-{{- $suffix := "" -}}
-{{- if .Values.canary.enabled -}}
-{{- $suffix = "-primary" -}}
-{{- end -}}
-{{- $url := printf "%s%s:%v" (include "podinfo.fullname" .) $suffix .Values.service.port -}}
+{{- $url := printf "%s%s.%s:%v" (include "podinfo.fullname" .) (include "podinfo.suffix" .) .Release.Namespace .Values.service.port -}}
 apiVersion: v1
 kind: ConfigMap
 metadata: