github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67033 from juanvallejo/jvallejo/add-corev1-pod-kubectl-conditions

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 58058, 67033, 66921, 66956). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

expose default LogsForObject consumeRequest func

**Release note**:
```release-note
NONE
```

Expose the `consumeRequest` func to make it reusable for other consumers of the `LogsForObject` polymorphic func
This commit is contained in:
Kubernetes Submit Queue 2018-08-06 17:01:08 -07:00 committed by GitHub
commit dda37a52ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/logs.go
View File

@ -214,7 +214,7 @@ func (o *LogsOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []str
return err return err
} }
o.ConsumeRequestFn = consumeRequest o.ConsumeRequestFn = DefaultConsumeRequest
o.GetPodTimeout, err = cmdutil.GetPodRunningTimeoutFlag(cmd) o.GetPodTimeout, err = cmdutil.GetPodRunningTimeoutFlag(cmd)
if err != nil { if err != nil {
@ -305,7 +305,7 @@ func (o LogsOptions) RunLogs() error {
return nil return nil
} }
func consumeRequest(request *rest.Request, out io.Writer) error { func DefaultConsumeRequest(request *rest.Request, out io.Writer) error {
readCloser, err := request.Stream() readCloser, err := request.Stream()
if err != nil { if err != nil {
return err return err

2
pkg/kubectl/cmd/run.go
View File

@ -530,7 +530,7 @@ func logOpts(restClientGetter genericclioptions.RESTClientGetter, pod *corev1.Po
return err return err
} }
for _, request := range requests { for _, request := range requests {
if err := consumeRequest(request, opts.Out); err != nil { if err := DefaultConsumeRequest(request, opts.Out); err != nil {
return err return err
} }
} }