Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify etcd options builder #10145

Merged
merged 1 commit into from
Oct 30, 2020
Merged

Simplify etcd options builder #10145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 9 additions & 33 deletions pkg/model/components/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
}

// Ensure the version is set
if c.Version == "" && c.Provider == kops.EtcdProviderTypeLegacy {
// Even if in legacy mode, etcd version 2 is unsupported as of k8s 1.13
if c.Version == "" {
// We run the k8s-recommended versions of etcd
if b.IsKubernetesGTE("1.17") {
c.Version = DefaultEtcd3Version_1_17
} else if b.IsKubernetesGTE("1.14") {
Expand All @@ -63,44 +63,20 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
}
}

if c.Version == "" && c.Provider == kops.EtcdProviderTypeManager {
// We run the k8s-recommended versions of etcd when using the manager
if b.IsKubernetesGTE("1.17") {
c.Version = DefaultEtcd3Version_1_17
} else if b.IsKubernetesGTE("1.14") {
c.Version = DefaultEtcd3Version_1_14
} else {
c.Version = DefaultEtcd3Version_1_13
}
// We make sure that etcd v3 is used
version := strings.TrimPrefix(c.Version, "v")
if !strings.HasPrefix(version, "3.") {
return fmt.Errorf("unexpected etcd version %q", c.Version)
}

// We enable TLS if we're running EtcdManager & etcd3
//
// (Moving to etcd3 is a disruptive upgrade, so we
// force TLS at the same time as we enable
// etcd-manager by default).
// We enable TLS if we're running EtcdManager
if c.Provider == kops.EtcdProviderTypeManager {
etcdV3 := true
version := c.Version
version = strings.TrimPrefix(version, "v")
if strings.HasPrefix(version, "2.") {
etcdV3 = false
} else if strings.HasPrefix(version, "3.") {
etcdV3 = true
} else {
return fmt.Errorf("unexpected etcd version %q", c.Version)
}

if etcdV3 {
c.EnableEtcdTLS = true
c.EnableTLSAuth = true
}
c.EnableEtcdTLS = true
c.EnableTLSAuth = true
}

// Remap the well known images
// We remap the etcd manager image when we build the manifest,
// but we need to map the standalone images here because protokube launches them

if c.Provider == kops.EtcdProviderTypeLegacy {

// remap etcd image
Expand Down