tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1906 from mikesir87/fix-log-names

Browse Source 
Fix container name used in kube log output
This commit is contained in:
Mathieu Champlon 2021-07-09 08:08:50 +02:00 committed by GitHub
commit 396d449d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kube/client/client.go
View File

@ -210,10 +210,11 @@ func (kc *KubeClient) GetLogs(ctx context.Context, projectName string, consumer
} }
eg, ctx := errgroup.WithContext(ctx) eg, ctx := errgroup.WithContext(ctx)
for _, pod := range pods.Items { for _, pod := range pods.Items {
request := kc.client.CoreV1().Pods(kc.namespace).GetLogs(pod.Name, &corev1.PodLogOptions{Follow: follow}) podName := pod.Name
request := kc.client.CoreV1().Pods(kc.namespace).GetLogs(podName, &corev1.PodLogOptions{Follow: follow})
service := pod.Labels[api.ServiceLabel] service := pod.Labels[api.ServiceLabel]
w := utils.GetWriter(func(line string) { w := utils.GetWriter(func(line string) {
consumer.Log(pod.Name, service, line) consumer.Log(podName, service, line)
}) })
eg.Go(func() error { eg.Go(func() error {