From ee28bcf0665640181a5414c69653b138fc703e03 Mon Sep 17 00:00:00 2001 From: Jawshua Date: Sun, 29 Mar 2020 17:25:53 +0000 Subject: [PATCH] [stable/spinnaker] Fix registry passwords being garbed when email is specified (#21362) Signed-off-by: Joshua Welsh --- stable/spinnaker/Chart.yaml | 2 +- stable/spinnaker/templates/configmap/halyard-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index 934703f14c..ddf8cacc4e 100644 --- a/stable/spinnaker/Chart.yaml +++ b/stable/spinnaker/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence. name: spinnaker -version: 2.0.0-rc1 +version: 2.0.0-rc2 appVersion: 1.16.2 home: http://spinnaker.io/ sources: diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml index 4c0dfc89f7..89ad034644 100644 --- a/stable/spinnaker/templates/configmap/halyard-config.yaml +++ b/stable/spinnaker/templates/configmap/halyard-config.yaml @@ -107,7 +107,7 @@ data: {{- else -}} CREDS+=" --password-file /opt/registry/passwords/{{ $registry.name }}" {{- end -}} - {{ if $registry.email -}} + {{ if $registry.email }} CREDS+=" --email {{ $registry.email }}" {{- end -}} {{- end }}