Merge branch 'ingress-flags' into 'develop'

{{ $ingressNginx := index .Values "ingress-nginx" }}

{{ $fabricApi := index .Values "fabric-api" }}

{{- if $fabricApi.enabled -}}

{{- if and $fabricApi.enabled $fabricApi.ingress.enabled -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

{{ $ingressNginx := index .Values "ingress-nginx" }}

{{ $kubePrometheusStack := index .Values "kube-prometheus-stack" }}

{{- if $kubePrometheusStack.setup -}}

{{- if and $kubePrometheusStack.setup $kubePrometheusStack.grafana.ingress.setup -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

              echo "Found Prometheus CR: ${PROM}"

              {{- if $kubePrometheusStack.prometheus.ingress.setup }}

              EXTERNAL_URL="http://${NODE_IP}:{{ $ingressNginx.controller.service.nodePorts.http }}/prometheus"

              {{- else }}

              EXTERNAL_URL="http://${NODE_IP}:{{ $kubePrometheusStack.prometheus.service.nodePort }}"

              {{- end }}

              echo "Setting Prometheus external URL to: ${EXTERNAL_URL}"

              kubectl patch prometheus "${PROM}" \

                -n "${RELEASE_NAMESPACE}" \

                --type merge \

                -p "{

                  \"spec\": {

                    \"externalUrl\": \"http://${NODE_IP}:{{ $ingressNginx.controller.service.nodePorts.http }}/prometheus\"

                    \"externalUrl\": \"${EXTERNAL_URL}\"

                  }

                }"

{{ $ingressNginx := index .Values "ingress-nginx" }}

{{ $peeringApi := index .Values "peering-api" }}

{{- if $peeringApi.enabled -}}

{{- if and $peeringApi.enabled $peeringApi.ingress.enabled -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

{{ $ingressNginx := index .Values "ingress-nginx" }}

{{ $portalCart := index .Values "portal-cart" }}

{{- if $portalCart.enabled -}}

{{- if and $portalCart.enabled $portalCart.ingress.enabled -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata: