mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #80651 from odinuge/kubectl-proxy-handle-error
Add error check in kubectl proxy on server setup
This commit is contained in:
commit
ca1514d03b
@ -99,7 +99,6 @@ vendor/k8s.io/kubectl/pkg/cmd/config
|
|||||||
vendor/k8s.io/kubectl/pkg/cmd/edit
|
vendor/k8s.io/kubectl/pkg/cmd/edit
|
||||||
vendor/k8s.io/kubectl/pkg/cmd/exec
|
vendor/k8s.io/kubectl/pkg/cmd/exec
|
||||||
vendor/k8s.io/kubectl/pkg/cmd/get
|
vendor/k8s.io/kubectl/pkg/cmd/get
|
||||||
vendor/k8s.io/kubectl/pkg/cmd/proxy
|
|
||||||
vendor/k8s.io/kubectl/pkg/cmd/rollingupdate
|
vendor/k8s.io/kubectl/pkg/cmd/rollingupdate
|
||||||
vendor/k8s.io/kubectl/pkg/cmd/scale
|
vendor/k8s.io/kubectl/pkg/cmd/scale
|
||||||
vendor/k8s.io/kubectl/pkg/cmd/set
|
vendor/k8s.io/kubectl/pkg/cmd/set
|
||||||
|
@ -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
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user