[stable/spinnaker] Fix the default value for gate-local.yml profile (h…

…elm#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 <[email protected]> * [stable/spinnaker] Bump chart version Signed-off-by: Mikhail Zholobov <[email protected]>
madifaya · May 31, 2019 · cc6b490 · cc6b490
1 parent d997932
commit cc6b490
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */}}