Merge "Add override flag to the ingress template"

diff --combined kubernetes/common/common/templates/_ingress.tpl
index 7823c54,935e318..c3c7443
--- 1/kubernetes/common/common/templates/_ingress.tpl
--- 2/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@@ -1,5 -1,6 +1,6 @@@
  {{- define "ingress.config.port" -}}
  {{- if .Values.ingress -}}
+ {{- if .Values.global.ingress -}}
  {{- if or (not .Values.global.ingress.virtualhost) (not .Values.global.ingress.virtualhost.enabled) -}}
    - http:
        paths:
@@@ -27,6 -28,7 +28,7 @@@
  {{- end -}}
  {{- end -}}
  {{- end -}}
+ {{- end -}}
  
  
  {{- define "ingress.config.annotations.ssl" -}}
@@@ -55,11 -57,27 +57,27 @@@ nginx.ingress.kubernetes.io/ssl-redirec
  {{ include "ingress.config.annotations.ssl" . | indent 4 | trim }}
  {{- end -}}
  
+ {{- define "common.ingress._overrideIfDefined" -}}
+   {{- $currValue := .currVal }}
+   {{- $parent := .parent }}
+   {{- $var := .var }}
+   {{- if $parent -}}
+     {{- if hasKey $parent $var }}
+       {{- default "" (index $parent $var) }}
+     {{- else -}}
+       {{- default "" $currValue -}}
+     {{- end -}}
+   {{- else -}}
+     {{- default "" $currValue }}
+   {{- end -}}
+ {{- end -}}
  
  {{- define "common.ingress" -}}
  {{- if .Values.ingress -}}
- {{- if .Values.global.ingress -}}
- {{- if and .Values.ingress.enabled .Values.global.ingress.enabled -}}
+   {{- $ingressEnabled := default false .Values.ingress.enabled -}}
+   {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" (default (dict) .Values.global.ingress) "var" "enabled") }}
+   {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" .Values.ingress "var" "enabledOverride") }}
+   {{- if $ingressEnabled }}
  apiVersion: extensions/v1beta1
  kind: Ingress
  metadata:
@@@ -69,7 -87,7 +87,7 @@@
    labels:
      app: {{ .Chart.Name }}
      chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 -    release: {{ .Release.Name }}
 +    release: {{ include "common.release" . }}
      heritage: {{ .Release.Service }}
  spec:
    rules:
@@@ -81,4 -99,3 +99,3 @@@
  {{- end -}}
  {{- end -}}
  {{- end -}}
- {{- end -}}