github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-22 07:03:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133067 from tchap/kubectl-logs-ctx

Browse Source 
kubectl/logs: Add LogOptions.RunLogsContext
This commit is contained in:
Kubernetes Prow Robot
2025-09-05 06:43:27 -07:00
committed by GitHub
parent 078a8f1894 cc4666cc94
commit 5988bf7f36
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
staging/src/k8s.io/kubectl/pkg/cmd/logs/logs.go
View File

@@ -356,8 +356,21 @@ func (o LogsOptions) Validate() error {
return nil
}
// RunLogs retrieves a pod log
// RunLogs wraps RunLogsContext with signal handling.
// When a signal is received, streaming is stopped, then followed by os.Exit(1).
func (o LogsOptions) RunLogs() error {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
intr := interrupt.New(nil, cancel)
return intr.Run(func() error {
return o.RunLogsContext(ctx)
})
}
// RunLogsContext retrieves a pod log.
//
// This function does not handle signals. To interrupt streaming, cancel the context.
func (o LogsOptions) RunLogsContext(ctx context.Context) error {
var requests map[corev1.ObjectReference]rest.ResponseWrapper
var err error
if o.AllPods {
@@ -378,16 +391,10 @@ func (o LogsOptions) RunLogs() error {
}
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
intr := interrupt.New(nil, cancel)
return intr.Run(func() error {
if o.Follow && len(requests) > 1 {
return o.parallelConsumeRequest(ctx, requests)
}
return o.sequentialConsumeRequest(ctx, requests)
})
if o.Follow && len(requests) > 1 {
return o.parallelConsumeRequest(ctx, requests)
}
return o.sequentialConsumeRequest(ctx, requests)
}
func (o LogsOptions) parallelConsumeRequest(ctx context.Context, requests map[corev1.ObjectReference]rest.ResponseWrapper) error {