diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go index 1117ce2f27e..d9efc17e885 100644 --- a/pkg/volume/host_path/host_path.go +++ b/pkg/volume/host_path/host_path.go @@ -18,7 +18,6 @@ package host_path import ( "fmt" - "time" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/types" @@ -142,7 +141,7 @@ func (r *hostPathRecycler) GetPath() string { // Recycle blocks until the pod has completed or any error occurs. // The scrubber pod's is expected to succeed within 30 seconds when testing localhost. func (r *hostPathRecycler) Recycle() error { - timeout := int64(30 * time.Second) + timeout := int64(30) pod := &api.Pod{ ObjectMeta: api.ObjectMeta{ GenerateName: "pv-scrubber-" + util.ShortenString(r.name, 44) + "-", diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 60cf405e5e6..16282b78cd9 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -19,7 +19,6 @@ package nfs import ( "fmt" "os" - "time" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/types" @@ -249,7 +248,7 @@ func (r *nfsRecycler) GetPath() string { // Recycle blocks until the pod has completed or any error occurs. // The scrubber pod's is expected to succeed within 5 minutes else an error will be returned func (r *nfsRecycler) Recycle() error { - timeout := int64(300 * time.Second) // 5 minutes + timeout := int64(300) // 5 minutes pod := &api.Pod{ ObjectMeta: api.ObjectMeta{ GenerateName: "pv-scrubber-" + util.ShortenString(r.name, 44) + "-",