Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert "Refactor kube exec to support io streams" #266

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Revert "Refactor kube exec to support io streams" #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions pkg/kube/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package kube

import (
"bytes"
"io"
"io/ioutil"
"net/url"
"strings"

log "github.com/sirupsen/logrus"
"k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
Expand Down Expand Up @@ -59,26 +59,6 @@ func Exec(cli kubernetes.Interface, namespace, pod, container string, command []
// returning stdout, stderr and error. `options` allowed for
// additional parameters to be passed.
func ExecWithOptions(kubeCli kubernetes.Interface, options ExecOptions) (string, string, error) {
config, err := LoadConfig()
if err != nil {
return "", "", err
}
o, e, errCh := execStream(kubeCli, config, options)
defer func() { _ = o.Close() }()
defer func() { _ = e.Close() }()
stdout, oerr := ioutil.ReadAll(o)
if oerr != nil {
log.Info("Failed to read stdout:", oerr.Error())
}
stderr, eerr := ioutil.ReadAll(e)
if eerr != nil {
log.Info("Failed to read stderr:", eerr.Error())
}

return string(stdout), string(stderr), <-errCh
}

func execStream(kubeCli kubernetes.Interface, config *restclient.Config, options ExecOptions) (io.ReadCloser, io.ReadCloser, chan error) {
const tty = false
req := kubeCli.CoreV1().RESTClient().Post().
Resource("pods").
Expand All @@ -98,16 +78,14 @@ func execStream(kubeCli kubernetes.Interface, config *restclient.Config, options
TTY: tty,
}, scheme.ParameterCodec)

pro, pwo := io.Pipe()
pre, pwe := io.Pipe()
errCh := make(chan error, 1)
go func() {
err := execute("POST", req.URL(), config, options.Stdin, pwo, pwe, tty)
errCh <- err
_ = pwo.Close()
_ = pwe.Close()
}()
return pro, pre, errCh
config, err := LoadConfig()
if err != nil {
return "", "", err
}

var stdout, stderr bytes.Buffer
err = execute("POST", req.URL(), config, options.Stdin, &stdout, &stderr, tty)
return strings.TrimSpace(stdout.String()), strings.TrimSpace(stderr.String()), err
}

func execute(method string, url *url.URL, config *restclient.Config, stdin io.Reader, stdout, stderr io.Writer, tty bool) error {
Expand Down