github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2026-06-23 02:04:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.9

Browse Source 
Kubernetes-commit: b854cd9fab66f77b5ad132d7559fa09f846a7407
This commit is contained in:
Kubernetes Publisher
2017-11-28 15:41:34 -08:00
parent 651d7a8818 84b6352f98
commit 8c3de10c2e
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@@ -172,31 +172,31 @@
},
{
"ImportPath": "github.com/gophercloud/gophercloud",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/utils",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/pagination",
"Rev": "54086d6c81b90e91e1d52b866ee726baf5cbe2b1"
"Rev": "db5f840b1d1a595280d643defc09ce277996959e"
},
{
"ImportPath": "github.com/gregjones/httpcache",

2
transport/cache.go
View File

@@ -88,5 +88,5 @@ func tlsConfigKey(c *Config) (string, error) {
return "", err
}
// Only include the things that actually affect the tls.Config
return fmt.Sprintf("%v/%x/%x/%x", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData), nil
return fmt.Sprintf("%v/%x/%x/%x/%v", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData, c.TLS.ServerName), nil
}

14
transport/cache_test.go
View File

@@ -62,6 +62,20 @@ func TestTLSConfigKey(t *testing.T) {
KeyData: []byte{1},
},
},
"cert 1, key 1, servername 1": {
TLS: TLSConfig{
CertData: []byte{1},
KeyData: []byte{1},
ServerName: "1",
},
},
"cert 1, key 1, servername 2": {
TLS: TLSConfig{
CertData: []byte{1},
KeyData: []byte{1},
ServerName: "2",
},
},
"cert 1, key 2": {
TLS: TLSConfig{
CertData: []byte{1},