From c94522bfbd6bc4f78c63f2d8e3404c0e2b6b8d53 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Mon, 27 May 2019 15:55:51 +0200 Subject: [PATCH] [stable/spinnaker] Fix default deck settings (#14088) * [stable/spinnaker] Fix default deck settings "API_HOST" env variable should be nested in "env" map Signed-off-by: Mikhail Zholobov * [stable/spinnaker] Bump chart version Signed-off-by: Mikhail Zholobov --- stable/spinnaker/Chart.yaml | 2 +- stable/spinnaker/templates/configmap/service-settings.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index 970f871c1b..d623148069 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.10.1 +version: 1.10.2 appVersion: 1.12.5 home: http://spinnaker.io/ sources: diff --git a/stable/spinnaker/templates/configmap/service-settings.yaml b/stable/spinnaker/templates/configmap/service-settings.yaml index ae89c6a119..7ce47ed130 100644 --- a/stable/spinnaker/templates/configmap/service-settings.yaml +++ b/stable/spinnaker/templates/configmap/service-settings.yaml @@ -26,7 +26,7 @@ Render settings for each service by merging predefined defaults with values pass {{/* Defaults: deck service */}} {{- $deckDefaults := dict -}} -{{- $_ := set $deckDefaults "API_HOST" "http://spin-gate:8084" -}} +{{- $_ := set $deckDefaults "env" (dict "API_HOST" "http://spin-gate:8084") -}} {{- if .Values.ingress.enabled -}} {{- $_ := set $deckDefaults "kubernetes" (dict "useExecHealthCheck" false "serviceType" "NodePort") -}} {{- end -}}