From 5a95accf98734a2c301ba40045184281f0ddb5b2 Mon Sep 17 00:00:00 2001
From: Miles Matthias <mmatthias@google.com>
Date: Thu, 14 Feb 2019 12:04:32 -0700
Subject: [PATCH] Revert API_HOST endpoint variable from gate to deck service
 setting (#11397)

* move the API_HOST variable to deck.yml, where it belongs

Signed-off-by: Miles Matthias <mmatthias@google.com>

* bump chart version for gate fix

Signed-off-by: Miles Matthias <mmatthias@google.com>
---
 stable/spinnaker/Chart.yaml                          |  2 +-
 .../templates/configmap/service-settings.yaml        | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index 9e8e4a2dcd..cf42e6e120 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.7.0
+version: 1.7.1
 appVersion: 1.11.6
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/templates/configmap/service-settings.yaml b/stable/spinnaker/templates/configmap/service-settings.yaml
index 4075765b8a..fe43e91326 100644
--- a/stable/spinnaker/templates/configmap/service-settings.yaml
+++ b/stable/spinnaker/templates/configmap/service-settings.yaml
@@ -18,6 +18,12 @@ data:
     {{- end }}
     skipLifeCycleManagement: true
   gate.yml: |-
+    kubernetes:
+    {{- if .Values.ingress.enabled }}
+      useExecHealthCheck: false
+      serviceType: NodePort
+    {{- end }}
+  deck.yml: |-
     env:
       API_HOST: http://spin-gate.{{ .Release.Namespace }}:8084
     kubernetes:
@@ -25,9 +31,3 @@ data:
       useExecHealthCheck: false
       serviceType: NodePort
     {{- end }}
-  deck.yml: |-
-    kubernetes:
-    {{- if .Values.ingress.enabled }}
-      useExecHealthCheck: false
-      serviceType: NodePort
-    {{- end }}