From 3c2ead5b29cb53736e77ecaec66e819953916c85 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Sun, 15 Feb 2015 22:25:14 -0800 Subject: [PATCH] pkg/kubelet: minor cleanup for probe.go --- pkg/kubelet/probe.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/kubelet/probe.go b/pkg/kubelet/probe.go index 9dada347057..b2955e257ef 100644 --- a/pkg/kubelet/probe.go +++ b/pkg/kubelet/probe.go @@ -71,12 +71,10 @@ func (kl *Kubelet) probeContainer(p *api.Probe, } func (kl *Kubelet) runProbe(p *api.Probe, podFullName string, podUID types.UID, status api.PodStatus, container api.Container) (probe.Result, error) { - var timeout time.Duration + timeout := defaultProbeTimeout secs := p.TimeoutSeconds if secs > 0 { timeout = time.Duration(secs) * time.Second - } else { - timeout = defaultProbeTimeout } if p.Exec != nil { return kl.prober.exec.Probe(kl.newExecInContainer(podFullName, podUID, container)) @@ -180,7 +178,6 @@ func (r *readinessStates) IsReady(c api.ContainerStatus) bool { return false } return r.get(strings.TrimPrefix(c.ContainerID, "docker://")) - } func (r *readinessStates) get(key string) bool {