github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-08 02:19:33 +00:00
Code Issues Projects Releases Wiki Activity

manully sync up to 1634d8f9f72a626b16c55573d78e8da2d75e6356

Browse Source 
(merging https://github.com/kubernetes/kubernetes/pull/42084). For the new publish
script to work, client-go has to be synced up to when k8s.io/kubernetes doesn't
include _vendor
This commit is contained in:
Chao Xu
2017-02-28 14:27:37 -08:00
parent 6500775c58
commit 6c315a68f3
1011 changed files with 25255 additions and 320508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rest/config.go
View File

@@ -83,10 +83,6 @@ type Config struct {
// TLSClientConfig contains settings to enable transport layer security
TLSClientConfig
// Server should be accessed without verifying the TLS
// certificate. For testing only.
Insecure bool
// UserAgent is an optional field that specifies the caller of this request.
UserAgent string
@@ -132,6 +128,13 @@ type ImpersonationConfig struct {
// TLSClientConfig contains settings to enable transport layer security
type TLSClientConfig struct {
// Server should be accessed without verifying the TLS certificate. For testing only.
Insecure bool
// ServerName is passed to the server for SNI and is used in the client to check server
// ceritificates against. If ServerName is empty, the hostname used to contact the
// server is used.
ServerName string
// Server requires TLS client certificate authentication
CertFile string
// Server requires TLS client certificate authentication
@@ -365,11 +368,12 @@ func AnonymousClientConfig(config *Config) *Config {
Prefix: config.Prefix,
ContentConfig: config.ContentConfig,
TLSClientConfig: TLSClientConfig{
CAFile: config.TLSClientConfig.CAFile,
CAData: config.TLSClientConfig.CAData,
Insecure: config.Insecure,
ServerName: config.ServerName,
CAFile: config.TLSClientConfig.CAFile,
CAData: config.TLSClientConfig.CAData,
},
RateLimiter: config.RateLimiter,
Insecure: config.Insecure,
UserAgent: config.UserAgent,
Transport: config.Transport,
WrapTransport: config.WrapTransport,