kubelet: enhance exec probe logging with pod and container context

Signed-off-by: xigang <wangxigang2014@gmail.com>

Author: xigang

pkg/kubelet/prober/prober.go

@@ -152,7 +152,11 @@ 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))
+		result, output, err := pb.exec.Probe(pb.newExecInContainer(ctx, container, containerID, command, timeout))
+		if err != nil {
+			klog.ErrorS(err, "Exec probe failed", "probeType", probeType, "pod", klog.KObj(pod), "containerName", container.Name, "command", command)
+		}
+		return result, output, err
 
 	case p.HTTPGet != nil:
 		req, err := httpprobe.NewRequestForHTTPGetAction(p.HTTPGet, &container, status.PodIP, "probe")
@@ -169,7 +173,11 @@ func (pb *prober) runProbe(ctx context.Context, probeType probeType, p *v1.Probe
 			headers := p.HTTPGet.HTTPHeaders
 			klogV4.InfoS("HTTP-Probe", "scheme", scheme, "host", host, "port", port, "path", path, "timeout", timeout, "headers", headers, "probeType", probeType)
 		}
-		return pb.http.Probe(req, timeout)
+		result, output, err := pb.http.Probe(req, timeout)
+		if err != nil {
+			klog.ErrorS(err, "HTTP probe failed", "probeType", probeType, "pod", klog.KObj(pod), "containerName", container.Name, "request", req)
+		}
+		return result, output, err
 
 	case p.TCPSocket != nil:
 		port, err := probe.ResolveContainerPort(p.TCPSocket.Port, &container)
@@ -182,7 +190,11 @@ func (pb *prober) runProbe(ctx context.Context, probeType probeType, p *v1.Probe
 			host = status.PodIP
 		}
 		klog.V(4).InfoS("TCP-Probe", "host", host, "port", port, "timeout", timeout)
-		return pb.tcp.Probe(host, port, timeout)
+		result, output, err := pb.tcp.Probe(host, port, timeout)
+		if err != nil {
+			klog.ErrorS(err, "TCP probe failed", "probeType", probeType, "pod", klog.KObj(pod), "containerName", container.Name, "host", host, "port", port, "timeout", timeout)
+		}
+		return result, output, err
 
 	case p.GRPC != nil:
 		host := status.PodIP
@@ -191,7 +203,11 @@ func (pb *prober) runProbe(ctx context.Context, probeType probeType, p *v1.Probe
 			service = *p.GRPC.Service
 		}
 		klog.V(4).InfoS("GRPC-Probe", "host", host, "service", service, "port", p.GRPC.Port, "timeout", timeout)
-		return pb.grpc.Probe(host, service, int(p.GRPC.Port), timeout)
+		result, output, err := pb.grpc.Probe(host, service, int(p.GRPC.Port), timeout)
+		if err != nil {
+			klog.ErrorS(err, "GRPC probe failed", "probeType", probeType, "pod", klog.KObj(pod), "containerName", container.Name, "host", host, "service", service, "port", p.GRPC.Port, "timeout", timeout)
+		}
+		return result, output, err
 
 	default:
 		klog.V(4).InfoS("Failed to find probe builder for container", "containerName", container.Name)