mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Merge pull request #4454 from xiang90/probe
pkg/kubelet: minor cleanup for probe.go
This commit is contained in:
commit
6f84bdaba8
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user