Merge "Make static manifest cleanup configurable"

charts/apiserver/templates/bin/_anchor.tpl

@@ -65,7 +65,9 @@ snapshot_files "${SNAPSHOT_DIR}"
 while true; do
     if [ -e /tmp/stop ]; then
         echo Stopping
+        {{- if .Values.anchor.enable_cleanup }}
         cleanup
+        {{- end }}
         break
     fi
 

charts/apiserver/values.yaml

@@ -77,6 +77,7 @@ labels:
 
 anchor:
   dns_policy: Default
+  enable_cleanup: true
   kubelet:
     manifest_path: /etc/kubernetes/manifests
   period: 15

charts/controller_manager/templates/bin/_anchor.tpl

@@ -37,7 +37,9 @@ while true; do
 
     if [ -e /tmp/stop ]; then
         echo Stopping
+        {{- if .Values.anchor.enable_cleanup }}
         cleanup
+        {{- end }}
         break
     fi
 

charts/controller_manager/values.yaml

@@ -27,6 +27,7 @@ labels:
 
 anchor:
   dns_policy: Default
+  enable_cleanup: true
   kubelet:
     manifest_path: /etc/kubernetes/manifests
   period: 15

charts/etcd/templates/bin/_pre_stop.tpl

@@ -26,6 +26,7 @@ function cleanup_host {
 # Let the anchor process know it should not try to start the server.
 touch /tmp/stopping
 
+{{- if .Values.anchor.enable_cleanup }}
 while true; do
     if etcdctl member list > /tmp/stop_members; then
         if grep $PEER_ENDPOINT /tmp/stop_members; then
@@ -43,3 +44,5 @@ while true; do
 
     sleep {{ .Values.anchor.period }}
 done
+{{- end }}
+touch /tmp/stopped

charts/etcd/values.yaml

@@ -25,6 +25,7 @@ labels:
 
 anchor:
   dns_policy: ClusterFirstWithHostNet
+  enable_cleanup: true
   etcdctl_endpoint: example-etcd
   host_data_path: /var/lib/etcd/example
 

charts/scheduler/templates/bin/_anchor.tpl

@@ -36,7 +36,9 @@ cleanup() {
 while true; do
     if [ -e /tmp/stop ]; then
         echo Stopping
+        {{- if .Values.anchor.enable_cleanup }}
         cleanup
+        {{- end }}
         break
     fi
 

charts/scheduler/values.yaml

@@ -2,6 +2,7 @@ release_group: null
 
 anchor:
   dns_policy: Default
+  enable_cleanup: true
   kubelet:
     manifest_path: /etc/kubernetes/manifests
   period: 15