From d60fe161a55ebc41127bed7c072f6c12308602bb Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Tue, 18 Jun 2019 16:22:42 -0500
Subject: [PATCH] Ingress: Update config to be compatible with k8s schema
 validation

This PS updates the ingress controller configmap to be valid with
k8s schema validation turned on.

Change-Id: Ibbc82be62398ee63eb353aa58f1ebdf98e66b30d
Signed-off-by: Pete Birley <pete@port.direct>
---
 ingress/templates/configmap-conf.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ingress/templates/configmap-conf.yaml b/ingress/templates/configmap-conf.yaml
index 5483b0fd4..d5a47a275 100644
--- a/ingress/templates/configmap-conf.yaml
+++ b/ingress/templates/configmap-conf.yaml
@@ -24,6 +24,10 @@ limitations under the License.
 {{- if empty (index .Values.conf.ingress "bind-address") -}}
 {{- $_ := set .Values.conf.ingress "bind-address" ( .Values.network.vip.addr | split "/" )._0 }}
 {{- end -}}
+{{- else -}}
+{{- if empty (index .Values.conf.ingress "bind-address") -}}
+{{- $_ := unset .Values.conf.ingress "bind-address" }}
+{{- end -}}
 {{- end -}}
 
 ---