Skip to content

Update: proxy kubectl logs #230

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

Merged
merged 1 commit into from
May 27, 2022
Merged

Update: proxy kubectl logs #230

Show file tree
Hide file tree
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
6 changes: 2 additions & 4 deletions pkg/cmd/proxy/kubectl/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,8 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
klog.V(4).Infof("kubeconfig file path is %s", tmpKubeconfigFilePath)

// Using kubectl to access the managed cluster using the above customized kubeconfig
result, err := runKubectlCommmand(tmpKubeconfigFilePath, o.kubectlArgs)
if err != nil {
return errors.Wrap(err, "run kubectl commands failed")
}
// We are using combinedoutput, so err msg should include in result, no need to handle err
result, _ := runKubectlCommmand(tmpKubeconfigFilePath, o.kubectlArgs)
if _, err = streams.Out.Write(result); err != nil {
return errors.Wrap(err, "streams out write failed")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/proxy/kubectl/http-proxy-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (s *httpProxyServer) handle(wr http.ResponseWriter, req *http.Request) {
if proxyConn != nil {
err = proxyConn.Close()
if err != nil {
klog.Errorf("connection closed: %v", err)
klog.V(4).ErrorS(err, "connection closed")
}
}
}()
Expand Down