kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80651 from odinuge/kubectl-proxy-handle-error 

Add error check in kubectl proxy on server setup

Kubernetes-commit: ca1514d03b85f2ad8ae888894362ae07db37f151
This commit is contained in:
Kubernetes Publisher 2020-02-09 11:23:52 -08:00
parent 757539aac7 4e367c0f16
commit 2a89737620
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -588,7 +588,7 @@
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "0d86229a457e" "Rev": "e34e74d72164"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

4
go.mod
View File

@ -40,7 +40,7 @@ require (
k8s.io/apimachinery v0.0.0-20200209065656-fb45917aae8b k8s.io/apimachinery v0.0.0-20200209065656-fb45917aae8b
k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a
k8s.io/client-go v0.0.0-20200209070101-af50d22222d3 k8s.io/client-go v0.0.0-20200209070101-af50d22222d3
k8s.io/component-base v0.0.0-20200209070609-0d86229a457e k8s.io/component-base v0.0.0-20200209110224-e34e74d72164
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b
@ -58,6 +58,6 @@ replace (
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a
k8s.io/client-go => k8s.io/client-go v0.0.0-20200209070101-af50d22222d3 k8s.io/client-go => k8s.io/client-go v0.0.0-20200209070101-af50d22222d3
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200209044353-396603da40fa k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200209044353-396603da40fa
k8s.io/component-base => k8s.io/component-base v0.0.0-20200209070609-0d86229a457e k8s.io/component-base => k8s.io/component-base v0.0.0-20200209110224-e34e74d72164
k8s.io/metrics => k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b k8s.io/metrics => k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b
) )

2
go.sum
View File

@ -317,7 +317,7 @@ k8s.io/apimachinery v0.0.0-20200209065656-fb45917aae8b/go.mod h1:5X8oEhnd931nEg6
k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a/go.mod h1:STmitnuF1Wn7OiGEN67PnaK8WXHx76SPGZgZKsIdtr8= k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a/go.mod h1:STmitnuF1Wn7OiGEN67PnaK8WXHx76SPGZgZKsIdtr8=
k8s.io/client-go v0.0.0-20200209070101-af50d22222d3/go.mod h1:lrXl4vvqm+n6jlzJDxwcfMx2obCLSV1hYD1HuaL7WEc= k8s.io/client-go v0.0.0-20200209070101-af50d22222d3/go.mod h1:lrXl4vvqm+n6jlzJDxwcfMx2obCLSV1hYD1HuaL7WEc=
k8s.io/code-generator v0.0.0-20200209044353-396603da40fa/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.0.0-20200209044353-396603da40fa/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200209070609-0d86229a457e/go.mod h1:9W3ADuxIg84JdjKHNl3fh3XfShf7mxOdoPJHuCabJ/o= k8s.io/component-base v0.0.0-20200209110224-e34e74d72164/go.mod h1:D0o0vo4rsOSZ/RBsvwDaBwyF8JBQwfUEhO8nnx89q9Y=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

9
pkg/cmd/proxy/proxy.go
View File

@ -200,6 +200,10 @@ func (o ProxyOptions) Validate() error {
func (o ProxyOptions) RunProxy() error { func (o ProxyOptions) RunProxy() error {
server, err := proxy.NewServer(o.staticDir, o.apiPrefix, o.staticPrefix, o.filter, o.clientConfig, o.keepalive) server, err := proxy.NewServer(o.staticDir, o.apiPrefix, o.staticPrefix, o.filter, o.clientConfig, o.keepalive)
if err != nil {
return err
}
// Separate listening from serving so we can report the bound port // Separate listening from serving so we can report the bound port
// when it is chosen by os (eg: port == 0) // when it is chosen by os (eg: port == 0)
var l net.Listener var l net.Listener
@ -209,9 +213,8 @@ func (o ProxyOptions) RunProxy() error {
l, err = server.ListenUnix(o.unixSocket) l, err = server.ListenUnix(o.unixSocket)
} }
if err != nil { if err != nil {
klog.Fatal(err) return err
} }
fmt.Fprintf(o.IOStreams.Out, "Starting to serve on %s\n", l.Addr().String()) fmt.Fprintf(o.IOStreams.Out, "Starting to serve on %s\n", l.Addr().String())
klog.Fatal(server.ServeOnListener(l)) return server.ServeOnListener(l)
return nil
} }