github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4454 from xiang90/probe

Browse Source 
pkg/kubelet: minor cleanup for probe.go
This commit is contained in:
Clayton Coleman 2015-02-16 16:53:58 -05:00
commit 6f84bdaba8
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/probe.go
View File

@ -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) { 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 secs := p.TimeoutSeconds
if secs > 0 { if secs > 0 {
timeout = time.Duration(secs) * time.Second timeout = time.Duration(secs) * time.Second
} else {
timeout = defaultProbeTimeout
} }
if p.Exec != nil { if p.Exec != nil {
return kl.prober.exec.Probe(kl.newExecInContainer(podFullName, podUID, container)) 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 false
} }
return r.get(strings.TrimPrefix(c.ContainerID, "docker://")) return r.get(strings.TrimPrefix(c.ContainerID, "docker://"))
} }
func (r *readinessStates) get(key string) bool { func (r *readinessStates) get(key string) bool {