From 2f07263d3dc42e78a3c288adae53b8e06f898ba7 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Sun, 21 May 2023 06:35:40 +0300
Subject: [PATCH] Update etcd to v3.5.9

---
 pkg/apis/kops/validation/validation.go      | 13 +++----------
 pkg/model/components/etcd.go                |  3 +--
 pkg/model/components/etcdmanager/options.go |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go
index 742e53dffd..78dae17564 100644
--- a/pkg/apis/kops/validation/validation.go
+++ b/pkg/apis/kops/validation/validation.go
@@ -1419,19 +1419,12 @@ func validateEtcdStorage(specs []kops.EtcdClusterSpec, fieldPath *field.Path) fi
 }
 
 // validateEtcdVersion is responsible for validating the storage version of etcd
-// @TODO semvar package doesn't appear to ignore a 'v' in v1.1.1; could be a problem later down the line
 func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minimalVersion *semver.Version) field.ErrorList {
-	// @check if the storage is specified that it's valid
-
-	if minimalVersion == nil {
-		v := semver.MustParse("0.0.0")
-		minimalVersion = &v
+	if spec.Version == "" {
+		return nil
 	}
 
 	version := spec.Version
-	if spec.Version == "" {
-		version = components.DefaultEtcd3Version_1_20
-	}
 
 	sem, err := semver.Parse(strings.TrimPrefix(version, "v"))
 	if err != nil {
@@ -1440,7 +1433,7 @@ func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minim
 
 	// we only support v3 for now
 	if sem.Major == 3 {
-		if sem.LT(*minimalVersion) {
+		if minimalVersion != nil && sem.LT(*minimalVersion) {
 			return field.ErrorList{field.Invalid(fieldPath.Child("version"), version, fmt.Sprintf("minimum version required is %s", minimalVersion.String()))}
 		}
 		return nil
diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go
index 4c3277d8cc..ddd297c8e9 100644
--- a/pkg/model/components/etcd.go
+++ b/pkg/model/components/etcd.go
@@ -29,8 +29,7 @@ type EtcdOptionsBuilder struct {
 var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}
 
 const (
-	DefaultEtcd3Version_1_20 = "3.4.13"
-	DefaultEtcd3Version_1_22 = "3.5.7"
+	DefaultEtcd3Version_1_22 = "3.5.9"
 )
 
 // BuildOptions is responsible for filling in the defaults for the etcd cluster model
diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go
index dd625f9eee..e272a53232 100644
--- a/pkg/model/components/etcdmanager/options.go
+++ b/pkg/model/components/etcdmanager/options.go
@@ -69,7 +69,7 @@ var etcdSupportedImages = map[string]string{
 	"3.2.24": "registry.k8s.io/etcd:3.2.24-1",
 	"3.3.17": "registry.k8s.io/etcd:3.3.17-0",
 	"3.4.13": "registry.k8s.io/etcd:3.4.13-0",
-	"3.5.7":  "registry.k8s.io/etcd:3.5.7-0",
+	"3.5.9":  "registry.k8s.io/etcd:3.5.9-0",
 }
 
 func etcdSupportedVersions() []string {