From ba0e74ae383f7fe8780cb7df4800fbd54dddad71 Mon Sep 17 00:00:00 2001
From: Thomas Marek <hello@iamthomasmarek.com>
Date: Fri, 15 Dec 2017 10:48:07 -0500
Subject: [PATCH] [stable/traefik] Allow enforcing SSL without having SSL
 enabled in Traefik itself (#2778)

* Allow to enforce SSL without having SSL enabled

* Bump Traefik Chart version to 1.4.3

* Always use regex redirect for enforcing SSL
---
 stable/traefik/Chart.yaml               | 2 +-
 stable/traefik/templates/configmap.yaml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml
index b4a89ef575..7311f66fb5 100755
--- a/stable/traefik/Chart.yaml
+++ b/stable/traefik/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: traefik
-version: 1.14.4
+version: 1.14.5
 appVersion: 1.4.5
 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support
 keywords:
diff --git a/stable/traefik/templates/configmap.yaml b/stable/traefik/templates/configmap.yaml
index b6a7be7993..873dc49f61 100644
--- a/stable/traefik/templates/configmap.yaml
+++ b/stable/traefik/templates/configmap.yaml
@@ -23,9 +23,10 @@ data:
       [entryPoints.http]
       address = ":80"
       compress = {{ .Values.gzip.enabled }}
-        {{- if and .Values.ssl.enabled .Values.ssl.enforced }}
+        {{- if .Values.ssl.enforced }}
         [entryPoints.http.redirect]
-          entryPoint = "https"
+          regex = "^http://(.*)"
+          replacement = "https://$1"
         {{- end }}
       {{- if .Values.ssl.enabled }}
       [entryPoints.https]