From 773fcd71cc782db8ee75dabdcecd9d75ed763dfd Mon Sep 17 00:00:00 2001
From: Anthony Lin <anthony.jclin@gmail.com>
Date: Wed, 11 Apr 2018 14:44:34 +0000
Subject: [PATCH] [Fix] Update Shipyard Chart - Shipyard FQDN

The 'proxy_read_timeout' needs to be a string instead of integer

Change-Id: Iaddbb617bb50ddc0aa70649662816e6dfab3d713
---
 .../shipyard/templates/ingress-shipyard-api.yaml   |  7 ++-----
 charts/shipyard/templates/service-shipyard.yaml    | 14 +++++++-------
 charts/shipyard/values.yaml                        |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/charts/shipyard/templates/ingress-shipyard-api.yaml b/charts/shipyard/templates/ingress-shipyard-api.yaml
index bab27ff9..381354c7 100644
--- a/charts/shipyard/templates/ingress-shipyard-api.yaml
+++ b/charts/shipyard/templates/ingress-shipyard-api.yaml
@@ -15,10 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.ingress_shipyard_api }}
-{{- $envAll := . }}
-{{- if .Values.network.shipyard.ingress.public }}
-{{- $ingressOpts := dict "envAll" . "backendService" "shipyard" "backendServiceType" "shipyard" "backendPort" "http" -}}
+{{- if and .Values.manifests.ingress_shipyard_api .Values.network.shipyard.ingress.public }}
+{{- $ingressOpts := dict "envAll" . "backendService" "shipyard" "backendServiceType" "shipyard" "backendPort" "api" -}}
 {{- $ingressOpts | include "helm-toolkit.manifests.ingress" -}}
 {{- end }}
-{{- end }}
diff --git a/charts/shipyard/templates/service-shipyard.yaml b/charts/shipyard/templates/service-shipyard.yaml
index 66667a9d..375a1e3c 100644
--- a/charts/shipyard/templates/service-shipyard.yaml
+++ b/charts/shipyard/templates/service-shipyard.yaml
@@ -25,16 +25,16 @@ metadata:
 spec:
   ports:
     {{ if .Values.network.shipyard.enable_node_port }}
-    - name: http
+    - name: api
+      protocol: TCP
       nodePort: {{ .Values.network.shipyard.node_port }}
-      port: {{ .Values.network.shipyard.port }}
-      protocol: TCP
-      targetPort: {{ .Values.network.shipyard.port }}
+      port: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+      targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ else }}
-    - name: http
-      port: {{ .Values.network.shipyard.port }}
+    - name: api
       protocol: TCP
-      targetPort: {{ .Values.network.shipyard.port }}
+      port: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+      targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ end }}
   selector:
 {{ tuple $envAll "shipyard-api" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml
index 7e6a1720..7f47a94b 100644
--- a/charts/shipyard/values.yaml
+++ b/charts/shipyard/values.yaml
@@ -48,8 +48,8 @@ network:
         namespace: "nginx"
         cluster: "nginx-cluster"
       annotations:
-        nginx.ingress.kubernetes.io/proxy_read_timeout: 600
-    port: 9000
+        nginx.ingress.kubernetes.io/rewrite-target: /
+        nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
     node_port: 31901
     enable_node_port: false
   airflow: