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

Merge pull request #60069 from wojtek-t/fix_components_statuses_crash 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix race in healthchecking etcds leading to crashes

Fix https://github.com/kubernetes/kubernetes/issues/59338
pull/6/head
Kubernetes Submit Queue 2018-02-20 05:12:52 -08:00 committed by GitHub
parent aec91e112b 38387aec0d
commit aa02c0f519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory.go
View File

@ -322,7 +322,9 @@ func (s *DefaultStorageFactory) Backends() []Backend {
for server := range servers { for server := range servers {
backends = append(backends, Backend{ backends = append(backends, Backend{
Server: server, Server: server,
TLSConfig: tlsConfig, // We can't share TLSConfig across different backends to avoid races.
// For more details see: http://pr.k8s.io/59338
TLSConfig: tlsConfig.Clone(),
}) })
} }
return backends return backends