Merge pull request #16723 from wulonghui/wulonghui-patch-4

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-04 04:59:16 -08:00
commit 75ecc34417

View File

@ -405,7 +405,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *api.Pod {
Name: "pv-recycler",
Image: "gcr.io/google_containers/busybox",
Command: []string{"/bin/sh"},
Args: []string{"-c", "test -e /scrub && echo $(date) > /scrub/trash.txt && rm -rf /scrub/* /scrub/.* && test -z \"$(ls -A /scrub)\" || exit 1"},
Args: []string{"-c", "test -e /scrub && echo $(date) > /scrub/trash.txt && find /scrub -mindepth 1 -maxdepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
VolumeMounts: []api.VolumeMount{
{
Name: "vol",