Merge branch 'v1.5' into master

2018-03-21 22:43:15 +01:00
parent af7c9b520f a3372acb6d
commit 007a1fc7f2
8 changed files with 26 additions and 16 deletions
--- a/docs/user-guide/kubernetes.md
+++ b/docs/user-guide/kubernetes.md
@@ -184,9 +184,9 @@ spec:
        securityContext:
          privileged: true
        args:
-        - -d
        - --api
        - --kubernetes
+        - --logLevel=INFO
 ---
 kind: Service
 apiVersion: v1