[stable/oauth2-proxy] Add ingress extraPaths support

Signed-off-by: Michael Barrientos <[email protected]>
helm · Jun 3, 2020 · 1af9558 · 1af9558
1 parent 88a5176
commit 1af9558
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/stable/oauth2-proxy/Chart.yaml b/stable/oauth2-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 3.1.0
+version: 3.2.0
 apiVersion: v1
 appVersion: 5.1.0
 home: https://pusher.github.io/oauth2_proxy/

diff --git a/stable/oauth2-proxy/README.md b/stable/oauth2-proxy/README.md
@@ -84,6 +84,7 @@ Parameter | Description | Default
 `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods)
 `ingress.enabled` | Enable Ingress | `false`
 `ingress.path` | Ingress accepted path | `/`
+`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.annotations` | Ingress annotations | `nil`
 `ingress.hosts` | Ingress accepted hostnames | `nil`
 `ingress.tls` | Ingress TLS configuration | `nil`

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

diff --git a/stable/oauth2-proxy/values.yaml b/stable/oauth2-proxy/values.yaml
@@ -85,6 +85,12 @@ ingress:
   # Used to create an Ingress record.
   # 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
   # annotations:
   #   kubernetes.io/ingress.class: nginx
   #   kubernetes.io/tls-acme: "true"