From f7edc873f188f1c5308f95034fdd048c413ac616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Roncero?= <jroncero@gmail.com>
Date: Mon, 18 Dec 2017 05:04:35 +0000
Subject: [PATCH] incubator/oauth-proxy Allow path to be configured (#2936)

* incubator/oauth-proxy Allow path to be configured

Allow path to be configured on the ingress. If one has a vhost that
needs to be shared with oauth proxy, then we need to be able to proxy
pass just /oauth2 to the proxy. Thus allowing it to be configured here.

* Update Chart version

* Fix variable inside range loop.
---
 incubator/oauth-proxy/Chart.yaml             | 2 +-
 incubator/oauth-proxy/templates/ingress.yaml | 3 ++-
 incubator/oauth-proxy/values.yaml            | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/incubator/oauth-proxy/Chart.yaml b/incubator/oauth-proxy/Chart.yaml
index 40a5b061ca..c8d8fecb31 100644
--- a/incubator/oauth-proxy/Chart.yaml
+++ b/incubator/oauth-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: oauth-proxy
-version: 0.1.0
+version: 0.1.2
 appVersion: 2.2
 description: A reverse proxy that provides authentication with Google, Github or other providers
 keywords:
diff --git a/incubator/oauth-proxy/templates/ingress.yaml b/incubator/oauth-proxy/templates/ingress.yaml
index f88b2f7d22..a0527bd1e5 100644
--- a/incubator/oauth-proxy/templates/ingress.yaml
+++ b/incubator/oauth-proxy/templates/ingress.yaml
@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $serviceName := include "oauth-proxy.fullname" . -}}
 {{- $servicePort := .Values.service.externalPort -}}
+{{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -20,7 +21,7 @@ spec:
     - host: {{ $host }}
       http:
         paths:
-          - path: /
+          - path: {{ $ingressPath }}
             backend:
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
diff --git a/incubator/oauth-proxy/values.yaml b/incubator/oauth-proxy/values.yaml
index 361dfa208c..8aebafa86f 100644
--- a/incubator/oauth-proxy/values.yaml
+++ b/incubator/oauth-proxy/values.yaml
@@ -25,6 +25,7 @@ service:
 
 ingress:
   enabled: false
+  path: /
   # Used to create an Ingress record.
   # hosts:
     # - chart-example.local