Revert "Merge pull request #9165 from smarterclayton/graceful"

This reverts commit 4f856b595d, reversing changes made to d78525a83b. Conflicts: pkg/kubelet/status_manager.go
2015-08-18 17:34:49 -07:00
parent 301bf16792
commit 08e6a43c1d
78 changed files with 452 additions and 1494 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -18,7 +18,6 @@ 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,7 +19,6 @@ spec:
      mountPath: /varlog
    - name: containers
      mountPath: /var/lib/docker/containers
-  terminationGracePeriodSeconds: 30
  volumes:
  - name: varlog
    hostPath: