Merge pull request #20495 from childsb/recycler_template_fix

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-13 11:30:14 -08:00
commit e3938ce15f

View File

@ -452,7 +452,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 && find /scrub -mindepth 1 -maxdepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
Args: []string{"-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"},
VolumeMounts: []api.VolumeMount{
{
Name: "vol",