From 4e3eefc450b111a70b1ac9a58da0a1ff75a65c38 Mon Sep 17 00:00:00 2001
From: John Prisco <johnprisco@users.noreply.github.com>
Date: Tue, 1 Sep 2020 04:22:28 -0400
Subject: [PATCH] [bitnami/nginx] Allow ingress extra paths to be set for host
 configuration (#3573)

* allow for extra paths to be set for alb annotations

* linting

* minor instead of patch version bump
---
 bitnami/nginx/Chart.yaml             | 2 +-
 bitnami/nginx/README.md              | 1 +
 bitnami/nginx/templates/ingress.yaml | 6 ++++++
 bitnami/nginx/values.yaml            | 9 +++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml
index f7795c8d0c..c92799361e 100644
--- a/bitnami/nginx/Chart.yaml
+++ b/bitnami/nginx/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx
-version: 6.1.0
+version: 6.2.0
 appVersion: 1.19.1
 description: Chart for the nginx server
 keywords:
diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md
index 9e5253bc4a..a305790b70 100644
--- a/bitnami/nginx/README.md
+++ b/bitnami/nginx/README.md
@@ -116,6 +116,7 @@ The following tables lists the configurable parameters of the NGINX Open Source
 | `ingress.annotations`                      | Ingress annotations                                                                          | `[]`                                                         |
 | `ingress.hosts[0].name`                    | Hostname to your NGINX installation                                                          | `nginx.local`                                                |
 | `ingress.hosts[0].path`                    | Path within the url structure                                                                | `/`                                                          |
+| `ingress.hosts[0].extraPaths`              | Ingress extra paths to prepend to every host configuration. Useful when configuring [custom actions with AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-alb-ingress-controller/guide/ingress/annotation/#actions). | `[]`                |
 | `ingress.tls[0].hosts[0]`                  | TLS hosts                                                                                    | `nginx.local`                                                |
 | `ingress.tls[0].secretName`                | TLS Secret (certificates)                                                                    | `nginx.local-tls`                                            |
 | `ingress.secrets[0].name`                  | TLS Secret Name                                                                              | `nil`                                                        |
diff --git a/bitnami/nginx/templates/ingress.yaml b/bitnami/nginx/templates/ingress.yaml
index 796935864a..ccb884c863 100644
--- a/bitnami/nginx/templates/ingress.yaml
+++ b/bitnami/nginx/templates/ingress.yaml
@@ -26,6 +26,12 @@ spec:
     - host: {{ .name }}
       http:
         paths:
+        {{- range .extraPaths }}
+          - path: {{ .path }}
+            backend:
+              serviceName: {{ .backend.serviceName }}
+              servicePort: {{ .backend.servicePort }}
+        {{- end }}
           - path: {{ default "/" .path }}
             backend:
               serviceName: "{{ template "nginx.fullname" $ }}"
diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml
index 2848701e5b..bc53d37f35 100644
--- a/bitnami/nginx/values.yaml
+++ b/bitnami/nginx/values.yaml
@@ -370,6 +370,15 @@ ingress:
         - example.local
       secretName: example.local-tls
 
+  hosts:
+
+    ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
+    extraPaths: []
+      # - path: /*
+      #   backend:
+      #     serviceName: ssl-redirect
+      #     servicePort: use-annotation
+
 
 healthIngress:
   ## Set to true to enable health ingress record generation