github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4278 from brendandburns/kubecfg

Browse Source 
Add an (optional) proxy to the TLS config.
This commit is contained in:
roberthbailey 2015-02-19 09:17:27 -08:00
commit bab8393e6a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/client/helper.go
View File

@ -19,6 +19,7 @@ package client
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -26,6 +27,7 @@ import (
"reflect" "reflect"
gruntime "runtime" gruntime "runtime"
"strings" "strings"
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
@ -228,6 +230,12 @@ func TransportFor(config *Config) (http.RoundTripper, error) {
if tlsConfig != nil { if tlsConfig != nil {
transport = &http.Transport{ transport = &http.Transport{
TLSClientConfig: tlsConfig, TLSClientConfig: tlsConfig,
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
} }
} else { } else {
transport = http.DefaultTransport transport = http.DefaultTransport