Merge pull request #12957 from smarterclayton/handle_terminating_pods

Auto commit by PR queue bot
2015-08-20 21:47:00 -07:00
parent ebe50ea692 2aaf8bddc2
commit 44c76d5319
47 changed files with 561 additions and 94 deletions
--- a/docs/getting-started-guides/logging.md
+++ b/docs/getting-started-guides/logging.md
@@ -182,6 +182,7 @@ spec:
      mountPath: /varlog
    - name: containers
      mountPath: /var/lib/docker/containers
+  terminationGracePeriodSeconds: 30
  volumes:
  - name: varlog
    hostPath: