From f672cf7c447e452a0d2a35fde3ab18737327744b Mon Sep 17 00:00:00 2001
From: Cola Chen <colachg@gmail.com>
Date: Fri, 1 Feb 2019 00:27:54 +0800
Subject: [PATCH] [stable/gocd] add host in template ingress.yaml instead of
 using default backend (#10983)

* if there is no host in template ingress.yaml, use default backend

Signed-off-by: cola <colachg@gmail.com>

* Update CHANGELOG

Signed-off-by: cola <colachg@gmail.com>
---
 stable/gocd/CHANGELOG.md           |  6 ++++++
 stable/gocd/Chart.yaml             |  2 +-
 stable/gocd/templates/ingress.yaml | 19 ++++++++++++++-----
 stable/gocd/values.yaml            |  4 ++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md
index ccd9f1c195..9d3d65f3b5 100644
--- a/stable/gocd/CHANGELOG.md
+++ b/stable/gocd/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.6.6
+
+* [84bd7fe](https://github.com/kubernetes/charts/commit/f44d408):
+
+- If there is no host in template ingress.yaml, use default backend.
+
 ### 1.6.5
 
 * [f44d408](https://github.com/kubernetes/charts/commit/f44d408):
diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml
index 4a5b053e6d..5c4d8f76bf 100644
--- a/stable/gocd/Chart.yaml
+++ b/stable/gocd/Chart.yaml
@@ -1,6 +1,6 @@
 name: gocd
 home: https://www.gocd.org/
-version: 1.6.5
+version: 1.6.6
 appVersion: 19.1.0
 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease.
 icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png
diff --git a/stable/gocd/templates/ingress.yaml b/stable/gocd/templates/ingress.yaml
index 4dd546797e..52206b52bd 100644
--- a/stable/gocd/templates/ingress.yaml
+++ b/stable/gocd/templates/ingress.yaml
@@ -15,16 +15,25 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
-  backend:
-    serviceName: {{ template "gocd.fullname" . }}-server
-    servicePort: {{ .Values.server.service.httpPort }}
+  {{- if .Values.server.ingress.hosts }}
+  {{ $dot := .}}
   rules:
     {{- range $host := .Values.server.ingress.hosts }}
     - host: {{ $host }}
-    {{- end -}}
+      http:
+        paths:
+        - backend:
+            serviceName: {{ template "gocd.fullname" $dot }}-server
+            servicePort: {{ $dot.Values.server.service.httpPort }}
+    {{- end }}
+  {{- else }}
+  backend:
+    serviceName: {{ template "gocd.fullname" . }}-server
+    servicePort: {{ .Values.server.service.httpPort }}
+  {{- end -}}
   {{- if .Values.server.ingress.tls }}
   tls:
 {{ toYaml .Values.server.ingress.tls | indent 4 }}
   {{- end -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/stable/gocd/values.yaml b/stable/gocd/values.yaml
index 10bb689bab..23bd22ba96 100644
--- a/stable/gocd/values.yaml
+++ b/stable/gocd/values.yaml
@@ -115,8 +115,8 @@ server:
     # server.ingress.enabled is the toggle to enable/disable GoCD Server Ingress
     enabled: true
     # server.ingress.hosts is used to create an Ingress record.
-#    hosts:
-#      - ci.example.com
+    # hosts:
+    # - ci.example.com
     annotations:
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"