Merge pull request #30393 from mbohlool/cleanup_sidepod

Automatic merge from submit-queue Start etcd-empty-dir-cleanup pod automatically on master etcd-empty-dir-cleanup removes empty directories from etcd every hour. This PR runs the pod automatically on GCI masters. related #30319 fixes #27307 Workaround for non-gci systems: ssh to master and: sudo cp /home/kubernetes/kube-manifests/kubernetes/gci-trusty/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml /etc/kubernetes/manifests/  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30393)

Merge pull request #30393 from mbohlool/cleanup_sidepod
613a2aa7 · Kubernetes Submit Queue · GitHub · f5861b9e · a5b2ffff · 613a2aa7
Commit 613a2aa7 authored Aug 11, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

configure-helper.sh cluster/gce/gci/configure-helper.sh +5 -0

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -549,6 +549,10 @@ function prepare-etcd-manifest {
  mv "${temp_file}" /etc/kubernetes/manifests
 }

+function start-etcd-empty-dir-cleanup-pod {
+  cp "${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml" "/etc/kubernetes/manifests"
+}
+
 # Starts etcd server pod (and etcd-events pod if needed).
 # More specifically, it prepares dirs and files, sets the variable value
 # in the manifests, and copies them to /etc/kubernetes/manifests.
@@ -1038,6 +1042,7 @@ start-kubelet
 if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
  compute-master-manifest-variables
  start-etcd-servers
+  start-etcd-empty-dir-cleanup-pod
  start-kube-apiserver
  start-kube-controller-manager
  start-kube-scheduler