Helm: Fix defaults for reporting status

* Fix external-status-address to use example ip 1.2.3.4 * Fix externalService default to be nginx-ingress as this will be the most common default * Removed quotes from externalService in values files and moved to templates to follow existing code style
nginx · Aug 16, 2018 · eb6e943 · eb6e943
1 parent daa9824
commit eb6e943
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/helm-chart/templates/controller-daemonset.yaml b/helm-chart/templates/controller-daemonset.yaml
@@ -86,7 +86,7 @@ spec:
 {{- if .Values.controller.reportIngressStatus.enable }}
           - -report-ingress-status
 {{- if .Values.controller.reportIngressStatus.externalService }}
-          - -external-service={{ .Values.controller.reportIngressStatus.externalService }}
+          - -external-service="{{ .Values.controller.reportIngressStatus.externalService }}"
 {{- end }}
 {{ if .Values.controller.reportIngressStatus.enableLeaderElection }}
           - -enable-leader-election

diff --git a/helm-chart/templates/controller-deployment.yaml b/helm-chart/templates/controller-deployment.yaml
@@ -72,7 +72,7 @@ spec:
 {{- if .Values.controller.reportIngressStatus.enable }}
           - -report-ingress-status
 {{- if .Values.controller.reportIngressStatus.externalService }}
-          - -external-service={{ .Values.controller.reportIngressStatus.externalService }}
+          - -external-service="{{ .Values.controller.reportIngressStatus.externalService }}"
 {{- end }}
 {{- if .Values.controller.reportIngressStatus.enableLeaderElection }}
           - -enable-leader-election

diff --git a/helm-chart/values-plus.yaml b/helm-chart/values-plus.yaml
@@ -14,7 +14,7 @@ controller:
     secret: # <namespace>/<secret_name>
   config:
     entries: {}
-      # external-status-address: "external-status-test"
+      # external-status-address: "1.2.3.4"
   nodeSelector: {}
   terminationGracePeriodSeconds: 30
   tolerations: ""
@@ -31,7 +31,7 @@ controller:
   serviceAccountName: nginx-ingress
   reportIngressStatus:
     enable: false
-    externalService: "external-svc"
+    externalService: nginx-ingress
     enableLeaderElection: true
 rbac:
   create: true

diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
@@ -9,7 +9,7 @@ controller:
     pullPolicy: IfNotPresent
   config:
     entries: {}
-      # external-status-address: "external-status-test"
+      # external-status-address: "1.2.3.4"
   # It is recommended to use your own TLS certificate and key
   defaultTLS:
     cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURTVENDQWpHZ0F3SUJBZ0lKQUs5L2NDNWZocDJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQ0V4SHpBZEJnTlYKQkFNVEZrNUhTVTVZU1c1bmNtVnpjME52Ym5SeWIyeHNaWEl3SGhjTk1UY3dPRE14TVRBeE16UTRXaGNOTVRndwpPRE14TVRBeE16UTRXakFoTVI4d0hRWURWUVFERXhaT1IwbE9XRWx1WjNKbGMzTkRiMjUwY205c2JHVnlNSUlCCklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF0bXhhMDhadExIaWxleWhOUWN5OUl4ankKWTBYdy9CRmZvM3duMDRsSXRoaGRxbkZ3NTZIVG1RVjIvbnEyRUxMdTNoejNjc3Urc3M5WFEzL3BrbXVwTEE5TApuaVVRZFVNcER4VlE1VFFKRW5CanJ5aXc4RWFlcEp4NUNCYVB5V3ZSZkpPb0pFSW56ZmNaYnE4OEVmQklYOHdtClFCa0xlcnFTVmRYWjBXR3FINVVQVlVZMVBqZXBqSXAyZ0NvbDRMUjM1aHRlSk9OMmZVTEF6cmRGMDBDT092WGsKUzgwRGw5eHdoUkVwVWVySGNuNXZod3BJazNkY3FNS3BxWTY2elF3dStMcFJEM3ZVWjR0eC9VYnlUdStkMkdhVwpWaG1RLy85RmtzUzVBS1d2ZXkrK3pPUTFDZTAxNzhDU0hRYXRDaWFuU2lTT3lwakZtTUZ0N1Mra25pbm9Xd0lECkFRQUJvNEdETUlHQU1CMEdBMVVkRGdRV0JCUlFUODVHRzV6a0QxV3FNSzZvOW8xWWFqUVBXVEJSQmdOVkhTTUUKU2pCSWdCUlFUODVHRzV6a0QxV3FNSzZvOW8xWWFqUVBXYUVscENNd0lURWZNQjBHQTFVRUF4TVdUa2RKVGxoSgpibWR5WlhOelEyOXVkSEp2Ykd4bGNvSUpBSzkvY0M1ZmhwMkdNQXdHQTFVZEV3UUZNQU1CQWY4d0RRWUpLb1pJCmh2Y05BUUVGQlFBRGdnRUJBSTIxcXpDN0lIYTEzblNvRkMxVFdtSUZydjQ2L2hRSFRjSFhxazRXZW16Z3VwVW8Kdmp0R05DVFlaR1VtL3RZY1FobDZvOXVJZlV5N3NlVS9OeWVCWHpOdGFiQUczQUIzanREVUJySy9xeVJ5cDZjRApIL0MzNmd5VFh3OGJxYVdOSzg0VGhYOVg2MFVFNVE2NzFUQUJMbk9paEhKUVVxTHdRc1VkdEkxRHBQb1BOOFlWCm5YQVl1RXJKWTVRckhzdHZoOFNZM2xoV3BSOWJ0eTVySldweUhIM3NDL1lHN2lFam5TUXp2LzdhK3cxTW1RQ0EKTk1wQnFvdzJKZkdveklyV2JvcFBVR2lmZ2szSjBKT24rcnA4RDRVc1lvNEo4Y3RvVk5qUFdmeU9zczB6ZWZ2aQpyUmVEUDdJOXc5THF1eERIRUhzeUpMUXN0MzNlQWlna1FBQU9zMUU9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
@@ -31,7 +31,7 @@ controller:
   serviceAccountName: nginx-ingress
   reportIngressStatus:
     enable: false
-    externalService: "external-svc"
+    externalService: nginx-ingress
     enableLeaderElection: true
 rbac:
   create: true