From 3dca350732e21e5d010145b9d7e7c49685bbfa45 Mon Sep 17 00:00:00 2001
From: Pantelis Malekas <pmalekas@ubitech.eu>
Date: Thu, 6 Aug 2026 18:07:40 +0300
Subject: [PATCH 1/2] fix: portail domain name fix and extra cases

---
 charts/hypo/templates/portal/deployment.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/charts/hypo/templates/portal/deployment.yaml b/charts/hypo/templates/portal/deployment.yaml
index f536cfe..74a6433 100644
--- a/charts/hypo/templates/portal/deployment.yaml
+++ b/charts/hypo/templates/portal/deployment.yaml
@@ -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 }}
-- 
GitLab


From c5f8666a2e63f51f903fa7119fc67f82161cc138 Mon Sep 17 00:00:00 2001
From: Pantelis Malekas <pmalekas@ubitech.eu>
Date: Thu, 6 Aug 2026 22:38:09 +0300
Subject: [PATCH 2/2] fix: corrected if statements

---
 charts/hypo/templates/portal/deployment.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/hypo/templates/portal/deployment.yaml b/charts/hypo/templates/portal/deployment.yaml
index 74a6433..1d75f2b 100644
--- a/charts/hypo/templates/portal/deployment.yaml
+++ b/charts/hypo/templates/portal/deployment.yaml
@@ -73,7 +73,7 @@ spec:
               {{- if eq .Values.installation "dev" }}
               value: http://$(NODE_IP):{{ .Values.portal.service.nodePort }}
               {{ else }}
-              value: {{ .Values.portal.domainName }}
+              value: {{ .Values.portal.domain }}
               {{- 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,20 +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") $kubePrometheusStack.grafana.ingress.setup }}
+              {{- if and (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) }}
+              {{ 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 or (eq .Values.installation "dev") .Values.portal.enabled }}
+              {{- if and (eq .Values.installation "dev") .Values.portal.ingress.enabled }}
               value: "http://$(NODE_IP):{{ $ingressNginx.controller.service.nodePorts.http }}"
-              {{ else if or (eq .Values.installation "dev") (not .Values.portal.ingress.enabled) }}
+              {{ else if and (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 }}
+              {{ else if eq .Values.installation "prod" }}
+              value: {{ .Values.portal.domain }}
               {{- end }}
           resources:
             {{- toYaml .Values.portal.resources | nindent 12 }}
-- 
GitLab