github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-08-08 23:37:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #132744 from xigang/probe_exec

Browse Source 
kubelet: enhance exec probe logging with pod and container context
This commit is contained in:
Kubernetes Prow Robot
2025-07-15 13:16:37 -07:00
committed by GitHub
parent 20344f9aba 4f0d3eaa36
commit f1bca15796
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ func (pb *prober) runProbe(ctx context.Context, probeType probeType, p *v1.Probe
case p.Exec != nil:
klog.V(4).InfoS("Exec-Probe runProbe", "pod", klog.KObj(pod), "containerName", container.Name, "execCommand", p.Exec.Command)
command := kubecontainer.ExpandContainerCommandOnlyStatic(p.Exec.Command, container.Env)
return pb.exec.Probe(pb.newExecInContainer(ctx, container, containerID, command, timeout))
return pb.exec.Probe(pb.newExecInContainer(ctx, pod, container, containerID, command, timeout))
case p.HTTPGet != nil:
req, err := httpprobe.NewRequestForHTTPGetAction(p.HTTPGet, &container, status.PodIP, "probe")
@@ -202,14 +202,18 @@ func (pb *prober) runProbe(ctx context.Context, probeType probeType, p *v1.Probe
type execInContainer struct {
// run executes a command in a container. Combined stdout and stderr output is always returned. An
// error is returned if one occurred.
run func() ([]byte, error)
writer io.Writer
run func() ([]byte, error)
writer io.Writer
pod *v1.Pod
container v1.Container
}
func (pb *prober) newExecInContainer(ctx context.Context, container v1.Container, containerID kubecontainer.ContainerID, cmd []string, timeout time.Duration) exec.Cmd {
return &execInContainer{run: func() ([]byte, error) {
return pb.runner.RunInContainer(ctx, containerID, cmd, timeout)
}}
func (pb *prober) newExecInContainer(ctx context.Context, pod *v1.Pod, container v1.Container, containerID kubecontainer.ContainerID, cmd []string, timeout time.Duration) exec.Cmd {
return &execInContainer{
run: func() ([]byte, error) { return pb.runner.RunInContainer(ctx, containerID, cmd, timeout) },
pod: pod,
container: container,
}
}
func (eic *execInContainer) Run() error {
@@ -253,7 +257,7 @@ func (eic *execInContainer) Start() error {
if eic.writer != nil {
// only record the write error, do not cover the command run error
if p, err := eic.writer.Write(data); err != nil {
klog.ErrorS(err, "Unable to write all bytes from execInContainer", "expectedBytes", len(data), "actualBytes", p)
klog.ErrorS(err, "Unable to write all bytes from execInContainer", "expectedBytes", len(data), "actualBytes", p, "pod", klog.KObj(eic.pod), "containerName", eic.container.Name)
}
}
return err

2
pkg/kubelet/prober/prober_test.go
View File

@@ -321,7 +321,7 @@ func TestNewExecInContainer(t *testing.T) {
container := v1.Container{}
containerID := kubecontainer.ContainerID{Type: "docker", ID: "containerID"}
cmd := []string{"/foo", "bar"}
exec := prober.newExecInContainer(ctx, container, containerID, cmd, 0)
exec := prober.newExecInContainer(ctx, &v1.Pod{}, container, containerID, cmd, 0)
var dataBuffer bytes.Buffer
writer := ioutils.LimitWriter(&dataBuffer, int64(limit))