[stable/grafana] Support ingress.extraPaths for grafana (helm#16628)

Signed-off-by: Paulo Martins <paulo.pontes.m@gmail.com>
arielb135 · Sep 4, 2019 · 1f03f9b · 1f03f9b
1 parent f74e7b6
commit 1f03f9b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.8.6
+version: 3.8.7
 appVersion: 6.3.4
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/stable/grafana/README.md b/stable/grafana/README.md
@@ -51,6 +51,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `ingress.labels`                          | Custom labels                                 | `{}`                                                    |
 | `ingress.path`                            | Ingress accepted path                         | `/`                                                     |
 | `ingress.hosts`                           | Ingress accepted hostnames                    | `[]`                                                    |
+| `ingress.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`                             | Ingress TLS configuration                     | `[]`                                                    |
 | `resources`                               | CPU/Memory resource requests/limits           | `{}`                                                    |
 | `nodeSelector`                            | Node labels for pod assignment                | `{}`                                                    |

diff --git a/stable/grafana/templates/ingress.yaml b/stable/grafana/templates/ingress.yaml
@@ -2,6 +2,7 @@
 {{- $fullName := include "grafana.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
+{{- $extraPaths := .Values.ingress.extraPaths -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -29,6 +30,9 @@ spec:
     - host: {{ . }}
       http:
         paths:
+{{ if $extraPaths }}
+{{ toYaml $extraPaths | indent 10 }}
+{{- end }}
           - path: {{ $ingressPath }}
             backend:
               serviceName: {{ $fullName }}

diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
@@ -114,6 +114,12 @@ ingress:
   path: /
   hosts:
     - chart-example.local
+  ## 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
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: