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

Use etcd v3.5.0 for Kubernetes 1.22+

This commit is contained in:
Ciprian Hacman 2021-07-06 20:24:16 +03:00
parent 7f93801afd
commit 1e41439e36
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ import (
"k8s.io/kops/upup/pkg/fi/loader" "k8s.io/kops/upup/pkg/fi/loader"
) )
const DefaultBackupImage = "k8s.gcr.io/etcdadm/etcd-backup:3.0.20210430" const DefaultBackupImage = "k8s.gcr.io/etcdadm/etcd-backup:3.0.20210707"
// EtcdOptionsBuilder adds options for etcd to the model // EtcdOptionsBuilder adds options for etcd to the model
type EtcdOptionsBuilder struct { type EtcdOptionsBuilder struct {
@ -35,8 +35,8 @@ var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}
const ( const (
DefaultEtcd3Version_1_17 = "3.4.3" DefaultEtcd3Version_1_17 = "3.4.3"
DefaultEtcd3Version_1_19 = "3.4.13" DefaultEtcd3Version_1_19 = "3.4.13"
DefaultEtcd3Version_1_22 = "3.5.0"
) )
// 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
@ -52,7 +52,9 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
// Ensure the version is set // Ensure the version is set
if c.Version == "" { if c.Version == "" {
// We run the k8s-recommended versions of etcd // We run the k8s-recommended versions of etcd
if b.IsKubernetesGTE("1.19") { if b.IsKubernetesGTE("1.22") {
c.Version = DefaultEtcd3Version_1_22
} else if b.IsKubernetesGTE("1.19") {
c.Version = DefaultEtcd3Version_1_19 c.Version = DefaultEtcd3Version_1_19
} else { } else {
c.Version = DefaultEtcd3Version_1_17 c.Version = DefaultEtcd3Version_1_17

2
pkg/model/components/etcdmanager/model.go
View File

@ -183,7 +183,7 @@ metadata:
namespace: kube-system namespace: kube-system
spec: spec:
containers: containers:
- image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707
name: etcd-manager name: etcd-manager
resources: resources:
requests: requests:

2
pkg/model/components/etcdmanager/options.go
View File

@ -67,7 +67,7 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error {
return nil return nil
} }
var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13"} var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13", "3.5.0"}
func etcdVersionIsSupported(version string) bool { func etcdVersionIsSupported(version string) bool {
version = strings.TrimPrefix(version, "v") version = strings.TrimPrefix(version, "v")