github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7487 from njuicsgz/master 

readinessProbe calls livenessProbe.Exec.Command which cause "invalid memory address or nil pointer dereference".
pull/6/head
Victor Marmol 2015-04-30 08:36:54 -07:00
parent baaea11cd5 b445afdf11
commit 0a6584cafe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/prober/prober.go
View File

@ -180,8 +180,8 @@ func (pb *prober) runProbeWithRetries(p *api.Probe, pod *api.Pod, status api.Pod
func (pb *prober) runProbe(p *api.Probe, pod *api.Pod, status api.PodStatus, container api.Container, containerID string) (probe.Result, error) { func (pb *prober) runProbe(p *api.Probe, pod *api.Pod, status api.PodStatus, container api.Container, containerID string) (probe.Result, error) {
timeout := time.Duration(p.TimeoutSeconds) * time.Second timeout := time.Duration(p.TimeoutSeconds) * time.Second
if p.Exec != nil { if p.Exec != nil {
glog.V(4).Infof("Exec-Probe Pod: %v, Container: %v", pod, container) glog.V(4).Infof("Exec-Probe Pod: %v, Container: %v, Command: %v", pod, container, p.Exec.Command)
return pb.exec.Probe(pb.newExecInContainer(pod, container, containerID)) return pb.exec.Probe(pb.newExecInContainer(pod, container, containerID, p.Exec.Command))
} }
if p.HTTPGet != nil { if p.HTTPGet != nil {
port, err := extractPort(p.HTTPGet.Port, container) port, err := extractPort(p.HTTPGet.Port, container)
@ -200,7 +200,7 @@ func (pb *prober) runProbe(p *api.Probe, pod *api.Pod, status api.PodStatus, con
glog.V(4).Infof("TCP-Probe PodIP: %v, Port: %v, Timeout: %v", status.PodIP, port, timeout) glog.V(4).Infof("TCP-Probe PodIP: %v, Port: %v, Timeout: %v", status.PodIP, port, timeout)
return pb.tcp.Probe(status.PodIP, port, timeout) return pb.tcp.Probe(status.PodIP, port, timeout)
} }
glog.Warningf("Failed to find probe builder for %s %+v", container.Name, container.LivenessProbe) glog.Warningf("Failed to find probe builder for container: %v", container)
return probe.Unknown, nil return probe.Unknown, nil
} }
@ -254,9 +254,9 @@ type execInContainer struct {
run func() ([]byte, error) run func() ([]byte, error)
} }
func (p *prober) newExecInContainer(pod *api.Pod, container api.Container, containerID string) exec.Cmd { func (p *prober) newExecInContainer(pod *api.Pod, container api.Container, containerID string, cmd []string) exec.Cmd {
return execInContainer{func() ([]byte, error) { return execInContainer{func() ([]byte, error) {
return p.Runner.RunInContainer(containerID, container.LivenessProbe.Exec.Command) return p.Runner.RunInContainer(containerID, cmd)
}} }}
} }