Helm: Fix external-service cli argument templates

nginx · Aug 13, 2018 · 85749e4 · 85749e4
1 parent b06f219
commit 85749e4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -31,8 +31,7 @@ controller:
   serviceAccountName: nginx-ingress
   reportIngressStatus:
     enable: false
-    externalAddress: fake-address
-    externalService: true
+    externalService: "external-svc"
   enableLeaderElection: true
 rbac:
   create: true