From 9f72d85b05ce1e748ed360572587f10faf657222 Mon Sep 17 00:00:00 2001
From: Mr Bleu <40758407+JGodin-C2C@users.noreply.github.com>
Date: Tue, 22 Oct 2019 03:47:22 +0200
Subject: [PATCH] Add protocol configuration for nginx-ldap-proxy (#15532)

Signed-off-by: Julien Godin <julien.godin@camptocamp.com>
---
 stable/nginx-ldapauth-proxy/Chart.yaml               | 3 ++-
 stable/nginx-ldapauth-proxy/templates/configmap.yaml | 2 +-
 stable/nginx-ldapauth-proxy/values.yaml              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/stable/nginx-ldapauth-proxy/Chart.yaml b/stable/nginx-ldapauth-proxy/Chart.yaml
index 06effc9b75..823a5ed015 100644
--- a/stable/nginx-ldapauth-proxy/Chart.yaml
+++ b/stable/nginx-ldapauth-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: nginx proxy with ldapauth
 name: nginx-ldapauth-proxy
 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
-version: 0.1.2
+version: 0.1.3
 appVersion: 1.13.5
 sources:
 - https://github.com/dweomer/dockerfiles-nginx-auth-ldap
@@ -12,3 +12,4 @@ maintainers:
   email: pete.brown@powerhrg.com
 - name: jar361
   email: jrodgers@powerhrg.com
+home: https://github.com/nginxinc/nginx-ldap-auth
diff --git a/stable/nginx-ldapauth-proxy/templates/configmap.yaml b/stable/nginx-ldapauth-proxy/templates/configmap.yaml
index c70900f38f..c0a99a37bc 100644
--- a/stable/nginx-ldapauth-proxy/templates/configmap.yaml
+++ b/stable/nginx-ldapauth-proxy/templates/configmap.yaml
@@ -24,7 +24,7 @@ data:
 
 {{- if and .Values.proxy.ldapHost .Values.secrets.ldapBindPassword }}
         ldap_server ldapserver {
-            url ldap://{{ .Values.proxy.ldapHost }}:{{ .Values.proxy.ldapPort }}/{{ .Values.proxy.ldapDN }}?uid?sub?(&({{ .Values.proxy.ldapFilter}}));
+            url {{ .Values.proxy.protocol }}://{{ .Values.proxy.ldapHost }}:{{ .Values.proxy.ldapPort }}/{{ .Values.proxy.ldapDN }}?uid?sub?(&({{ .Values.proxy.ldapFilter}}));
             binddn "{{ .Values.proxy.ldapBindDN }}";
             binddn_passwd {{ .Values.secrets.ldapBindPassword }};
             group_attribute {{ .Values.proxy.ldapGroup }};
diff --git a/stable/nginx-ldapauth-proxy/values.yaml b/stable/nginx-ldapauth-proxy/values.yaml
index d5f664b5aa..2b93a37be1 100644
--- a/stable/nginx-ldapauth-proxy/values.yaml
+++ b/stable/nginx-ldapauth-proxy/values.yaml
@@ -14,6 +14,7 @@ service:
   externalPort: 443
   internalPort: 80
 proxy:
+  protocol: "ldap"
   port: 443
   host: "kubernetes.default.svc.cluster.local"
   authName: "Auth Required"