Use Dial with context

This commit is contained in:
Mikhail Mazurskiy
2018-05-19 08:14:37 +10:00
parent 77a08ee2d7
commit 5e8e570dbd
25 changed files with 111 additions and 110 deletions

View File

@@ -17,6 +17,7 @@ limitations under the License.
package master
import (
"context"
"crypto/tls"
"encoding/json"
"io/ioutil"
@@ -108,7 +109,7 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, informers.SharedI
config.GenericConfig.LoopbackClientConfig = &restclient.Config{APIPath: "/api", ContentConfig: restclient.ContentConfig{NegotiatedSerializer: legacyscheme.Codecs}}
config.ExtraConfig.KubeletClientConfig = kubeletclient.KubeletClientConfig{Port: 10250}
config.ExtraConfig.ProxyTransport = utilnet.SetTransportDefaults(&http.Transport{
Dial: func(network, addr string) (net.Conn, error) { return nil, nil },
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { return nil, nil },
TLSClientConfig: &tls.Config{},
})