Merge branch 'v1.5' into master

2018-03-21 22:43:15 +01:00 · 2018-03-21 22:43:15 +01:00 · 007a1fc7f2
commit 007a1fc7f2
parent af7c9b520f a3372acb6d
8 changed files with 26 additions and 16 deletions
--- a/examples/k8s/traefik-deployment.yaml
+++ b/examples/k8s/traefik-deployment.yaml
@ -31,6 +31,7 @@ spec:
        args:
        - --api
        - --kubernetes
+        - --logLevel=INFO
 ---
 kind: Service
 apiVersion: v1
--- a/examples/k8s/traefik-ds.yaml
+++ b/examples/k8s/traefik-ds.yaml
@ -34,9 +34,9 @@ spec:
        securityContext:
          privileged: true
        args:
-        - -d
        - --api
        - --kubernetes
+        - --logLevel=INFO
 ---
 kind: Service
 apiVersion: v1