Skip to content

K
k3s
Commit 613a2aa7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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/ <!-- Reviewable:start --> --- 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) <!-- Reviewable:end -->
parents f5861b9e a5b2ffff
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cluster/gce/gci/configure-helper.sh
View file @ 613a2aa7
...@@ -549,6 +549,10 @@ function prepare-etcd-manifest { ...@@ -549,6 +549,10 @@ function prepare-etcd-manifest {
mv "${temp_file}" /etc/kubernetes/manifests 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). # Starts etcd server pod (and etcd-events pod if needed).
# More specifically, it prepares dirs and files, sets the variable value # More specifically, it prepares dirs and files, sets the variable value
# in the manifests, and copies them to /etc/kubernetes/manifests. # in the manifests, and copies them to /etc/kubernetes/manifests.
...@@ -1038,6 +1042,7 @@ start-kubelet ...@@ -1038,6 +1042,7 @@ start-kubelet
if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
compute-master-manifest-variables compute-master-manifest-variables
start-etcd-servers start-etcd-servers
start-etcd-empty-dir-cleanup-pod
start-kube-apiserver start-kube-apiserver
start-kube-controller-manager start-kube-controller-manager
start-kube-scheduler start-kube-scheduler
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment