From 83fb7c7c023df11a741ac1753361f69df595d673 Mon Sep 17 00:00:00 2001
From: Hechmi Dammak <hechmi.dammak@xenit.eu>
Date: Wed, 31 Jul 2024 10:12:39 +0200
Subject: [PATCH] modify mapToRoot to be default backend and use defaultPath

---
 xenit-aps/templates/ingress/ingress.yaml | 8 ++++----
 xenit-aps/values.yaml                    | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xenit-aps/templates/ingress/ingress.yaml b/xenit-aps/templates/ingress/ingress.yaml
index 804694b..71e41e2 100644
--- a/xenit-aps/templates/ingress/ingress.yaml
+++ b/xenit-aps/templates/ingress/ingress.yaml
@@ -17,7 +17,7 @@ spec:
       # Provide a unique secret to store the SSL credentials
       secretName: tls-activiti-{{ .Release.Name }}-secret
   {{- end }}
-  {{- if not .Values.ingress.defaultBackend.mapToRootOnly }}
+  {{- if .Values.ingress.defaultBackend }}
   defaultBackend:
     service:
       name: {{ .Values.ingress.defaultBackend.service }}
@@ -28,14 +28,14 @@ spec:
   - host: {{ required "A host where your activiti services can be reached on must be specified in values.ingress.host" .Values.ingress.host }}
     http:
       paths:
-      {{- if .Values.ingress.defaultBackend }}
+      {{- if .Values.ingress.defaultPath }}
       - path: /
         pathType: Prefix
         backend:
           service:
-            name: {{ .Values.ingress.defaultBackend.service }}
+            name: {{ .Values.ingress.defaultPath.service }}
             port:
-              number: {{ .Values.ingress.defaultBackend.port }}
+              number: {{ .Values.ingress.defaultPath.port }}
       {{- end }}
       {{- if .Values.activiti.ingress.enabled }}
       - path: /activiti-app
diff --git a/xenit-aps/values.yaml b/xenit-aps/values.yaml
index c8809be..b7b234b 100644
--- a/xenit-aps/values.yaml
+++ b/xenit-aps/values.yaml
@@ -42,8 +42,7 @@ ingress:
   protocol: 'http'
   ingressAnnotations:
     kubernetes.io/ingress.class: "nginx"
-  defaultBackend:
-    mapToRootOnly: true
+  defaultPath:
     service: nginx-default-service
     port: 30403
   blockedPaths: