rename probe.Status to probe.Result.

This commit is contained in:
Mike Danese
2015-01-30 17:03:57 -08:00
parent 8e6f5c7201
commit 14bfec92f2
14 changed files with 22 additions and 23 deletions

View File

@@ -39,7 +39,7 @@ var (
tcprober = tcprobe.New()
)
func (kl *Kubelet) probeContainer(p *api.Probe, podFullName string, podUID types.UID, status api.PodStatus, container api.Container) (probe.Status, error) {
func (kl *Kubelet) probeContainer(p *api.Probe, podFullName string, podUID types.UID, status api.PodStatus, container api.Container) (probe.Result, error) {
var timeout time.Duration
secs := container.LivenessProbe.TimeoutSeconds
if secs > 0 {
@@ -47,7 +47,6 @@ func (kl *Kubelet) probeContainer(p *api.Probe, podFullName string, podUID types
} else {
timeout = 1 * time.Second
}
if p.Exec != nil {
return execprober.Probe(kl.newExecInContainer(podFullName, podUID, container))
}