Skip to content

K
k3s
Commit 6f84bdab authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Merge pull request #4454 from xiang90/probe

pkg/kubelet: minor cleanup for probe.go
parents f27bcf50 3c2ead5b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
pkg/kubelet/probe.go
View file @ 6f84bdab
...@@ -71,12 +71,10 @@ func (kl *Kubelet) probeContainer(p *api.Probe, ...@@ -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 { ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment