Merge branch 'develop' into ingress-flags

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

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

{{- if $portalCart.enabled -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

  name: {{ template "hypo.portal-cart.fullname" . }}

  namespace: {{ .Release.Namespace  }}

  annotations:

    nginx.ingress.kubernetes.io/ssl-redirect: "false"

spec:

  ingressClassName: {{ $ingressNginx.controller.ingressClass }}

  rules:

  - http:

      paths:

      - path: /hypo-portal

        pathType: Prefix

        backend:

          service:

            name: {{ template "hypo.portal-cart.fullname" . }}

            port:

              number: {{ $portalCart.service.port }}

    {{ if eq .Values.installation "prod" }}

    host: hyper-orchestrator.eu

    {{- end }}

{{- end -}}

          service:

            name: {{ template "hypo.tmf-api.fullname" . }}

            port:

              number: 8088

              number: {{ $tmfApi.service.port }}

    {{ if eq .Values.installation "prod" }}

    host: hyper-orchestrator.eu

    {{- end }}