kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61459 from hzxuzhonghu/etcdv3-dial-timeout 

Automatic merge from submit-queue (batch tested with PRs 62324, 61459, 62475, 62476, 61914). 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>.

etcdv3 client: add dial timeout

dial timeout is necessary for a reliable system, this pr add it for establishing an etcd connection.

**Release note**:

```release-note
NONE
```

Kubernetes-commit: 1b4c4898cb5d1af77c84ba9097b678bca9b6747a
This commit is contained in:
Kubernetes Publisher 2018-04-12 13:18:08 -07:00
parent 9290515fd4 c5ff2cea2f
commit 7def594521
2 changed files with 153 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
Godeps/Godeps.json generated
View File

@ -1148,595 +1148,595 @@
},
{
"ImportPath": "k8s.io/client-go/discovery",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/apps",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/batch",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/core",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/core/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/events",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/networking",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/networking/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/policy",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/settings",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/storage",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/networking/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/pkg/version",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/plugin/pkg/client/auth/exec",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/rest",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/rest/watch",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/testing",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/auth",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/metrics",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/pager",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/tools/reference",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/transport",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/util/buffer",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/util/cert",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/util/homedir",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/util/integer",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/client-go/util/retry",
"Rev": "dd92f6b11395f23fbffdd5f403c25ba7ccae1226"
"Rev": "92a7e0590135445af85d49e68630552180bd9e0a"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/builder",

7
pkg/storage/storagebackend/factory/etcd3.go
View File

@ -29,11 +29,13 @@ import (
"k8s.io/apiserver/pkg/storage/value"
)
// The short keepalive timeout and interval have been chosen to aggressively
// detect a failed etcd server without introducing much overhead.
var (
// The short keepalive timeout and interval have been chosen to aggressively
// detect a failed etcd server without introducing much overhead.
keepaliveTime = 30 * time.Second
keepaliveTimeout = 10 * time.Second
// dialTimeout is the timeout for failing to establish a connection.
dialTimeout = 10 * time.Second
)
func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {
@ -52,6 +54,7 @@ func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, e
tlsConfig = nil
}
cfg := clientv3.Config{
DialTimeout: dialTimeout,
DialKeepAliveTime: keepaliveTime,
DialKeepAliveTimeout: keepaliveTimeout,
Endpoints: c.ServerList,