From 838dc91c09857470c330db77092d6e660ad5be2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?=
 <macabrera@bitnami.com>
Date: Thu, 29 Aug 2019 13:49:55 +0200
Subject: [PATCH] [stable/odoo] Fix Odoo ingress to support multiple paths
 (#16645)

* Fix Odoo ingress to support multiple paths

Signed-off-by: Miguel A. Cabrera Minagorri <macabrera@bitnami.com>

* Adapt TLS on the odoo ingress

Signed-off-by: Miguel A. Cabrera Minagorri <macabrera@bitnami.com>
---
 stable/odoo/Chart.yaml             | 2 +-
 stable/odoo/templates/ingress.yaml | 7 ++++---
 stable/odoo/values.yaml            | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/stable/odoo/Chart.yaml b/stable/odoo/Chart.yaml
index c897a10dd5..3e8bfab2b8 100644
--- a/stable/odoo/Chart.yaml
+++ b/stable/odoo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: odoo
-version: 10.1.2
+version: 10.1.3
 appVersion: 12.0.20190815
 description: A suite of web based open source business apps.
 home: https://www.odoo.com/
diff --git a/stable/odoo/templates/ingress.yaml b/stable/odoo/templates/ingress.yaml
index 6b85fddf50..13cecc638a 100644
--- a/stable/odoo/templates/ingress.yaml
+++ b/stable/odoo/templates/ingress.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -18,6 +17,7 @@ metadata:
     {{- end }}
 spec:
   rules:
+  {{- range .Values.ingress.hosts }}
   - host: {{ .name }}
     http:
       paths:
@@ -25,12 +25,13 @@ spec:
           backend:
             serviceName: {{ template "odoo.fullname" $ }}
             servicePort: http
-{{- if .tls }}
+  {{- end }}
   tls:
   - hosts:
+{{ range .Values.ingress.hosts }}
+{{- if .tls }}
     - {{ .name }}
     secretName: {{ .tlsSecret }}
 {{- end }}
----
 {{- end }}
 {{- end }}
diff --git a/stable/odoo/values.yaml b/stable/odoo/values.yaml
index 7962ad5b47..e0ce0ebf19 100644
--- a/stable/odoo/values.yaml
+++ b/stable/odoo/values.yaml
@@ -144,6 +144,7 @@ ingress:
   ## Most likely this will be just one host, but in the event more hosts are needed, this is an array
   hosts:
   - name: odoo.local
+    path: /
 
     ## Set this to true in order to enable TLS on the ingress record
     ## A side effect of this will be that the backend odoo service will be connected at port 443