github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-28 03:47:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36229 from wojtek-t/bump_etcd_version

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 36229, 39450)

Bump etcd to 3.0.14 and switch to v3 API in etcd.

Ref #20504

**Release note**:

```release-note
Switch default etcd version to 3.0.14.
Switch default storage backend flag in apiserver to `etcd3` mode.
```
This commit is contained in:
Kubernetes Submit Queue
2017-01-04 17:36:06 -08:00
committed by GitHub
parent a104229e1a 498a893fa3
commit f4a8713088
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/storage/storagebackend/config.go
View File

@@ -26,7 +26,7 @@ const (
// Config is configuration for creating a storage backend.
type Config struct {
// Type defines the type of storage backend, e.g. "etcd2", etcd3". Default ("") is "etcd2".
// Type defines the type of storage backend, e.g. "etcd2", etcd3". Default ("") is "etcd3".
Type string
// Prefix is the prefix to all keys passed to storage.Interface methods.
Prefix string

4
pkg/storage/storagebackend/factory/factory.go
View File

@@ -29,9 +29,9 @@ type DestroyFunc func()
// Create creates a storage backend based on given config.
func Create(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {
switch c.Type {
case storagebackend.StorageTypeUnset, storagebackend.StorageTypeETCD2:
case storagebackend.StorageTypeETCD2:
return newETCD2Storage(c)
case storagebackend.StorageTypeETCD3:
case storagebackend.StorageTypeUnset, storagebackend.StorageTypeETCD3:
// TODO: We have the following features to implement:
// - Support secure connection by using key, cert, and CA files.
// - Honor "https" scheme to support secure connection in gRPC.