Commit fb9d7eed authored by Nikos Psaromanolakis's avatar Nikos Psaromanolakis
Browse files

Merge branch 'portal-domain-fix' into 'develop' 

Portal domain fix

See merge request !20
parents dbb72bd5 c5f8666a

charts/hypo/templates/portal/deployment.yaml

+7 −3
Original line number Diff line number Diff line
@@ -112,15 +112,19 @@ spec: 
            - name: DOMAINS_URL

              value: "http://{{ include "hypo.fabric-api.fullname" . }}.{{ .Release.Namespace  }}.svc.cluster.local:{{ include "hypo.fabric.port" . }}/fabric-api/domain/identities"

            - name: NEXT_PUBLIC_GRAFANA_URL

              {{- if eq .Values.installation "dev" }}

              {{- if and (eq .Values.installation "dev") $kubePrometheusStack.grafana.ingress.setup }}

              value: "http://$(NODE_IP):{{ $ingressNginx.controller.service.nodePorts.http }}/grafana/login"

              {{ else if and (eq .Values.installation "dev") (not $kubePrometheusStack.grafana.ingress.setup) }}

              value: "http://{{ template "hypo.grafana.url" . }}:{{ $kubePrometheusStack.grafana.service.nodePort }}/login"

              {{ else }}

              value: "{{ $kubePrometheusStack.grafana.env.GF_SERVER_ROOT_URL }}/login"

              {{- end }}

            - name: AUTH_URL

              {{- if eq .Values.installation "dev" }}

              {{- if and (eq .Values.installation "dev") .Values.portal.ingress.enabled }}

              value: "http://$(NODE_IP):{{ $ingressNginx.controller.service.nodePorts.http }}"

              {{ else }}

              {{ else if and (eq .Values.installation "dev") (not .Values.portal.ingress.enabled) }}

              value: "http://$(NODE_IP):{{ .Values.portal.service.nodePort }}"

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

              value: {{ .Values.portal.domain }}

              {{- end }}

          resources: