From 3e43eb735c2da44565aea81bd65bb155fbaa2272 Mon Sep 17 00:00:00 2001
From: Sylvain Boily <sylvain.boily@gmail.com>
Date: Thu, 27 Jul 2017 17:46:43 -0400
Subject: [PATCH] [stable/traefik] Upgrade traefik version to 1.3.4, fix
 toleration with 1.5 cluster and give traefik access to secrets for the k8s
 basic authentication (#1485)

* update traefik version to 1.3.4

* Fixing the toleration support for 1.5.X k8s cluster

* applying the following fix from upstream:
https://github.com/containous/traefik/commit/ca5bbab20a661b3b3810aeba84f2169322c88fd4
---
 stable/traefik/Chart.yaml                | 4 ++--
 stable/traefik/templates/deployment.yaml | 7 ++++---
 stable/traefik/templates/rbac.yaml       | 1 +
 stable/traefik/values.yaml               | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml
index b3709b04cb..23684b0102 100755
--- a/stable/traefik/Chart.yaml
+++ b/stable/traefik/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: traefik
-version: 1.7.0
-appVersion: 1.3.1
+version: 1.7.1
+appVersion: 1.3.4
 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support
 keywords:
 - traefik
diff --git a/stable/traefik/templates/deployment.yaml b/stable/traefik/templates/deployment.yaml
index 9aaca5403b..34bb4727f1 100644
--- a/stable/traefik/templates/deployment.yaml
+++ b/stable/traefik/templates/deployment.yaml
@@ -14,10 +14,11 @@ spec:
       app: {{ template "fullname" . }}
   template:
     metadata:
-      labels:
-        {{- if and (.Values.tolerations) (le .Capabilities.KubeVersion.Minor "5") }}
+      {{- if and (.Values.tolerations) (le .Capabilities.KubeVersion.Minor "5") }}
+      annotations:
         scheduler.alpha.kubernetes.io/tolerations: '{{ toJson .Values.tolerations }}'
-        {{- end }}
+      {{- end }}
+      labels:
         app: {{ template "fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
diff --git a/stable/traefik/templates/rbac.yaml b/stable/traefik/templates/rbac.yaml
index 6ee44655af..e3195d09a1 100644
--- a/stable/traefik/templates/rbac.yaml
+++ b/stable/traefik/templates/rbac.yaml
@@ -15,6 +15,7 @@ rules:
       - pods
       - services
       - endpoints
+      - secret
     verbs:
       - get
       - list
diff --git a/stable/traefik/values.yaml b/stable/traefik/values.yaml
index 07038df5f1..35c58d2577 100644
--- a/stable/traefik/values.yaml
+++ b/stable/traefik/values.yaml
@@ -1,6 +1,6 @@
 # Default values for Traefik
 image: traefik
-imageTag: 1.3.1
+imageTag: 1.3.4
 serviceType: LoadBalancer
 replicas: 1
 cpuRequest: 100m