Revert "Revert "Gracefully delete pods from the Kubelet""

This reverts commit 98115facfd.
2015-06-02 20:36:58 -04:00
parent 919c7e94e2
commit b842a7dd15
60 changed files with 841 additions and 246 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -18,6 +18,7 @@ spec:
      mountPath: /varlog
    - name: containers
      mountPath: /var/lib/docker/containers
+  terminationGracePeriodSeconds: 30
  volumes:
  - name: varlog
    hostPath:
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -19,6 +19,7 @@ spec:
      mountPath: /varlog
    - name: containers
      mountPath: /var/lib/docker/containers
+  terminationGracePeriodSeconds: 30
  volumes:
  - name: varlog
    hostPath: