Commit 3dca3507 authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

fix: portail domain name fix and extra cases

parent dbb72bd5

charts/hypo/templates/portal/deployment.yaml

+9 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ spec: 
              {{- if eq .Values.installation "dev" }}

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

              {{ else }}

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

              value: {{ .Values.portal.domainName }}

              {{- end }}

            - name: CART_BASE_URL

              value: "http://{{ include "hypo.portal-cart.fullname" . }}.{{ .Release.Namespace  }}.svc.cluster.local:{{ include "hypo.portal-cart.port" . }}/hypo-portal/cart"
@@ -112,16 +112,20 @@ 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 (eq .Values.installation "dev") $kubePrometheusStack.grafana.ingress.setup }}

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

              {{ else if (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 or (eq .Values.installation "dev") .Values.portal.enabled }}

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

              {{ else }}

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

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

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

              {{ else if or .Values.portal.domain (eq .Values.installation "prod") }}

              value: {{ .Values.portal.domainName }}

              {{- end }}

          resources:

            {{- toYaml .Values.portal.resources | nindent 12 }}