github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27381 from dims/fix-issue-2967 

Automatic merge from submit-queue

Fix problem specifying fqdn:port in command line

When specifying --server in kubectl for example, we end up
with failure if you use "localhost:8080" instead of
"127.0.0.1:8080". This is because of the way url.Parse
works as shown in snippet:
https://play.golang.org/p/luD57S6sEz

Essentially localhost ends up as the Scheme and NOT as the Host.
So we add another check to make sure we prepend the scheme
when Host ends up being empty as well. Tested with
"kubectl --server localhost:8080 get po"

Fixes #2967
pull/6/head
k8s-merge-robot 2016-07-07 13:21:58 -07:00 committed by GitHub
parent 715d2f2358 0d86251f5f
commit b3c2c9eb5d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/client/restclient/url_utils.go
View File

@ -36,7 +36,7 @@ func DefaultServerURL(host, apiPath string, groupVersion unversioned.GroupVersio
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
if hostURL.Scheme == "" { if hostURL.Scheme == "" || hostURL.Host == "" {
scheme := "http://" scheme := "http://"
if defaultTLS { if defaultTLS {
scheme = "https://" scheme = "https://"