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

Merge pull request #7341 from justinsb/etcd_default_3_3_10 

Default etcd-version to 3.3.10 for >= 1.14
This commit is contained in:
Kubernetes Prow Robot 2019-07-29 17:46:50 -07:00 committed by GitHub
parent 9478909962 1795d2586d
commit 5cfd1a081b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/model/components/etcd.go
View File

@ -40,6 +40,8 @@ const (
DefaultEtcd3Version_1_11 = "3.2.24" DefaultEtcd3Version_1_11 = "3.2.24"
DefaultEtcd3Version_1_13 = "3.2.24" DefaultEtcd3Version_1_13 = "3.2.24"
DefaultEtcd3Version_1_14 = "3.3.10"
) )
// BuildOptions is responsible for filling in the defaults for the etcd cluster model // BuildOptions is responsible for filling in the defaults for the etcd cluster model
@ -60,7 +62,9 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
// Ensure the version is set // Ensure the version is set
if c.Version == "" && c.Provider == kops.EtcdProviderTypeLegacy { if c.Version == "" && c.Provider == kops.EtcdProviderTypeLegacy {
// Even if in legacy mode, etcd version 2 is unsupported as of k8s 1.13 // Even if in legacy mode, etcd version 2 is unsupported as of k8s 1.13
if b.IsKubernetesGTE("1.13") { if b.IsKubernetesGTE("1.14") {
c.Version = DefaultEtcd3Version_1_14
} else if b.IsKubernetesGTE("1.13") {
c.Version = DefaultEtcd3Version_1_13 c.Version = DefaultEtcd3Version_1_13
} else { } else {
c.Version = DefaultEtcd2Version c.Version = DefaultEtcd2Version
@ -69,7 +73,11 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
if c.Version == "" && c.Provider == kops.EtcdProviderTypeManager { if c.Version == "" && c.Provider == kops.EtcdProviderTypeManager {
// From 1.11, we run the k8s-recommended versions of etcd when using the manager // From 1.11, we run the k8s-recommended versions of etcd when using the manager
if b.IsKubernetesGTE("1.11") { if b.IsKubernetesGTE("1.14") {
c.Version = DefaultEtcd3Version_1_14
} else if b.IsKubernetesGTE("1.13") {
c.Version = DefaultEtcd3Version_1_13
} else if b.IsKubernetesGTE("1.11") {
c.Version = DefaultEtcd3Version_1_11 c.Version = DefaultEtcd3Version_1_11
} else { } else {
c.Version = DefaultEtcd2Version c.Version = DefaultEtcd2Version