From cc6b490de16b0186101476bad593a9c431cf3438 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Fri, 31 May 2019 20:26:27 +0200 Subject: [PATCH] [stable/spinnaker] Fix the default value for gate-local.yml profile (#14232) * [stable/spinnaker] Fix the default value for gate profile The default value for "gate-local.yml" key is changed from an empty string to the empty dict, because of the specifics of "mergeOverride" function called below. It doesn't merge the dictionary on top of the string and silently leaves a string as a result. Changing the default to an empty dict fixes the issue, since "mergeOverride" mutates the dict to any other struct. Signed-off-by: Mikhail Zholobov * [stable/spinnaker] Bump chart version Signed-off-by: Mikhail Zholobov --- stable/spinnaker/Chart.yaml | 2 +- .../templates/configmap/additional-profile-configmaps.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index e3f764aa62e3..48487d1682e0 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: 1.11.0 +version: 1.11.1 appVersion: 1.12.5 home: http://spinnaker.io/ sources: diff --git a/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml b/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml index c6688fb0e098..ea0efdb8c724 100644 --- a/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml +++ b/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml @@ -8,7 +8,7 @@ metadata: Render profiles for each service by merging predefined defaults with values passed by .Values.halyard.additionalProfileConfigMaps.data */}} -{{- $profiles := dict "gate-local.yml" "" -}} +{{- $profiles := dict "gate-local.yml" dict -}} {{- /* Defaults: Disable S3 versioning on Front50 if Minio storage is used */}} {{- /* https://www.spinnaker.io/setup/install/storage/minio/#editing-your-storage-settings */}}