From 85749e471ab95ae1a2ca631b83ca5da28e3dd9d7 Mon Sep 17 00:00:00 2001
From: dean-coakley <dean.s.coakley@gmail.com>
Date: Mon, 13 Aug 2018 11:19:37 +0100
Subject: [PATCH] Helm: Fix external-service cli argument templates

---
 helm-chart/templates/controller-daemonset.yaml  | 2 +-
 helm-chart/templates/controller-deployment.yaml | 2 +-
 helm-chart/values-plus.yaml                     | 3 +--
 helm-chart/values.yaml                          | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/helm-chart/templates/controller-daemonset.yaml b/helm-chart/templates/controller-daemonset.yaml
index 9491c8e1a2..214fa2f0b8 100644
--- a/helm-chart/templates/controller-daemonset.yaml
+++ b/helm-chart/templates/controller-daemonset.yaml
@@ -84,7 +84,7 @@ spec:
           - -health-status
 {{- end }}
 {{- if and (.Values.controller.reportIngressStatus.enable) (.Values.controller.reportIngressStatus.externalService) }}
-          - -external-service
+          - -external-service={{ .Values.controller.reportIngressStatus.externalService }}
 {{- end }}
 {{ if .Values.controller.enableLeaderElection }}
           - -enable-leader-election
diff --git a/helm-chart/templates/controller-deployment.yaml b/helm-chart/templates/controller-deployment.yaml
index ee524eaacf..4b53fd5c36 100644
--- a/helm-chart/templates/controller-deployment.yaml
+++ b/helm-chart/templates/controller-deployment.yaml
@@ -70,7 +70,7 @@ spec:
           - -health-status
 {{- end }}
 {{- if and (.Values.controller.reportIngressStatus.enable) (.Values.controller.reportIngressStatus.externalService) }}
-          - -external-service
+          - -external-service={{ .Values.controller.reportIngressStatus.externalService }}
 {{- end }}
 {{ if .Values.controller.enableLeaderElection }}
           - -enable-leader-election
diff --git a/helm-chart/values-plus.yaml b/helm-chart/values-plus.yaml
index b3bb39ab96..8fcb8e3552 100644
--- a/helm-chart/values-plus.yaml
+++ b/helm-chart/values-plus.yaml
@@ -31,8 +31,7 @@ controller:
   serviceAccountName: nginx-ingress
   reportIngressStatus:
     enable: false
-    externalAddress: fake-address
-    externalService: true
+    externalService: "external-svc"
   enableLeaderElection: true
 rbac:
   create: true
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index eb56401daa..9537837261 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -31,8 +31,7 @@ controller:
   serviceAccountName: nginx-ingress
   reportIngressStatus:
     enable: false
-    externalAddress: fake-address
-    externalService: true
+    externalService: "external-svc"
   enableLeaderElection: true
 rbac:
   create: true