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

Remove 'tlsConfig != nil' check 

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
pull/564/head
Mikkel Oscar Lyderik Larsen 2019-02-18 09:45:31 +01:00
parent 93abdb1205
commit 9f34d8bc79
No known key found for this signature in database
GPG Key ID: 50AD98B2A0D8D4EF
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/util.go
View File

@ -4226,16 +4226,10 @@ func OpenWebSocketForURL(url *url.URL, config *restclient.Config, protocols []st
if err != nil {
return nil, fmt.Errorf("Failed to create tls config: %v", err)
}
if tlsConfig != nil || url.Scheme == "https" {
if url.Scheme == "https" {
url.Scheme = "wss"
if !strings.Contains(url.Host, ":") {
url.Host += ":443"
}
} else {
url.Scheme = "ws"
if !strings.Contains(url.Host, ":") {
url.Host += ":80"
}
}
headers, err := headersForConfig(config, url)
if err != nil {