From 16921251ed893cf9286e9c26e7386195bdedaa21 Mon Sep 17 00:00:00 2001 From: David Gammon Date: Mon, 23 Dec 2024 14:03:41 +0000 Subject: [PATCH] Adding container name to log config --- pkg/skaffold/k8sjob/logger/log.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/skaffold/k8sjob/logger/log.go b/pkg/skaffold/k8sjob/logger/log.go index 270129b76fc..de68b955b9a 100644 --- a/pkg/skaffold/k8sjob/logger/log.go +++ b/pkg/skaffold/k8sjob/logger/log.go @@ -166,6 +166,7 @@ func (l *Logger) streamLogsFromKubernetesJob(ctx context.Context, id, namespace } } var podName string + var containerName string w, err := clientset.CoreV1().Pods(namespace).Watch(ctx, metav1.ListOptions{ LabelSelector: labels.Set(map[string]string{"job-name": id, "skaffold.dev/run-id": l.labeller.GetRunID()}).String(), @@ -180,6 +181,7 @@ func (l *Logger) streamLogsFromKubernetesJob(ctx context.Context, id, namespace pod, ok := event.Object.(*corev1.Pod) if ok { podName = pod.Name + containerName = pod.Spec.Containers[0].Name done <- true break } @@ -195,9 +197,7 @@ func (l *Logger) streamLogsFromKubernetesJob(ctx context.Context, id, namespace return false, fmt.Errorf("timeout waiting for event from pod of kubernetes job: %s", id) } - podLogOptions := &corev1.PodLogOptions{ - Follow: true, - } + podLogOptions := &corev1.PodLogOptions{Follow: true, Container: containerName} // Stream the logs req := clientset.CoreV1().Pods(namespace).GetLogs(podName, podLogOptions)