-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding container name to log config #9627
base: main
Are you sure you want to change the base?
Adding container name to log config #9627
Conversation
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi team,
I'm currently reviewing this pull request and will have a full review ready in a few minutes. In the meantime, here's a quick summary to help you and other reviewers get up to speed:
This pull request addresses issue #9626 by adding the container name to the log configuration in Skaffold's Kubernetes Job logger. The goal is to improve log streaming by specifying the container from which logs should be retrieved.
Here's a breakdown of the changes:
pkg/skaffold/k8sjob/logger/log.go
: This file received the core changes.- Three sections were modified to incorporate the
containerName
variable. - Lines 168-169: A
containerName
variable is declared to store the container name. - Lines 183-184: The
containerName
variable is populated with the name of the first container in the pod's specification. - Lines 199-200: The
containerName
is used in thePodLogOptions
to specify which container's logs to retrieve.
- Three sections were modified to incorporate the
The changes ensure that logs are streamed from the correct container, resolving potential ambiguity and improving the accuracy of log output.
And now, a little haiku to lighten the mood:
Containers aligned,
Logs stream clear, a joyful sight,
Skaffold's heart sings on.
Thanks,
Gemini
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pull request addresses issue #9626 by adding the container name to the log configuration, enabling Skaffold to stream logs from a specific container in a Kubernetes Job. This is a valuable improvement. The implementation generally looks correct and efficient. However, the current approach assumes the job only has one container. It's crucial to handle cases where a job might have multiple containers.
Here are a few suggestions to enhance the implementation:
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line assumes the pod has only one container, taking the name of the first container in the spec. Jobs can have multiple containers. Consider adding a mechanism to specify the target container. A few options include:
--container
flag: Allow users to specify the container name via a command-line flag.skaffold.yaml
configuration: Add a field in theskaffold.yaml
to configure the target container for logging.- Default behavior: If no container is explicitly specified, either log from all containers or emit a warning message indicating the ambiguity and perhaps defaulting to the first container.
Choosing a suitable approach will provide flexibility and prevent unexpected behavior when jobs have multiple containers.
podLogOptions := &corev1.PodLogOptions{ | ||
Follow: true, | ||
} | ||
podLogOptions := &corev1.PodLogOptions{Follow: true, Container: containerName} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's good practice to check if containerName
is empty before using it in podLogOptions
. This will prevent potential issues if the pod has no containers or if the container name retrieval logic encounters an issue. If the name is empty, you could log a warning or return an error, depending on the desired behavior.
podLogOptions := &corev1.PodLogOptions{Follow: true, Container: containerName} | |
podLogOptions := &corev1.PodLogOptions{Follow: true} | |
if containerName != "" { | |
podLogOptions.Container = containerName | |
} |
Fixes: #9626
Description
See issue #9626