Merge 'v1.4.2' into master

2017-11-03 13:51:24 +01:00
parent 91ff94ea56 0347537f43
commit 2070aa9443
16 changed files with 304 additions and 87 deletions
--- a/docs/user-guide/kubernetes.md
+++ b/docs/user-guide/kubernetes.md
@@ -121,6 +121,7 @@ kind: Service
 apiVersion: v1
 metadata:
  name: traefik-ingress-service
+  namespace: kube-system
 spec:
  selector:
    k8s-app: traefik-ingress-lb
@@ -185,6 +186,7 @@ kind: Service
 apiVersion: v1
 metadata:
  name: traefik-ingress-service
+  namespace: kube-system
 spec:
  selector:
    k8s-app: traefik-ingress-lb