From 689b76d0ff22e438e318b315521660f2be111a3e Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Sun, 2 May 2021 08:50:19 +0300
Subject: [PATCH] Mark control-plane node for update when etcd manager config
 changes

---
 pkg/model/bootstrapscript.go                           |  1 +
 pkg/model/components/etcdmanager/options.go            |  8 --------
 .../minimal-etcd/cloudformation.json.extracted.yaml    | 10 ++++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
index fcfa092533..11da889e81 100644
--- a/pkg/model/bootstrapscript.go
+++ b/pkg/model/bootstrapscript.go
@@ -328,6 +328,7 @@ func (b *BootstrapScript) Run(c *fi.Context) error {
 					c := kops.EtcdClusterSpec{
 						Image:         etcdCluster.Image,
 						Version:       etcdCluster.Version,
+						Manager:       etcdCluster.Manager,
 						CPURequest:    etcdCluster.CPURequest,
 						MemoryRequest: etcdCluster.MemoryRequest,
 					}
diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go
index 10baf5c727..f968b88156 100644
--- a/pkg/model/components/etcdmanager/options.go
+++ b/pkg/model/components/etcdmanager/options.go
@@ -45,10 +45,6 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error {
 			continue
 		}
 
-		if etcdCluster.Manager == nil {
-			etcdCluster.Manager = &kops.EtcdManagerSpec{}
-		}
-
 		if etcdCluster.Backups == nil {
 			etcdCluster.Backups = &kops.EtcdBackupSpec{}
 		}
@@ -57,10 +53,6 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error {
 			etcdCluster.Backups.BackupStore = urls.Join(base, "backups", "etcd", etcdCluster.Name)
 		}
 
-		if etcdCluster.Version == "" {
-			etcdCluster.Version = "3.2.18"
-		}
-
 		if !etcdVersionIsSupported(etcdCluster.Version) {
 			if featureflag.SkipEtcdVersionCheck.Enabled() {
 				klog.Warningf("etcd version %q is not known to be supported, but ignoring because of SkipEtcdVersionCheck feature flag", etcdCluster.Version)
diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml
index 84428e70a5..ec0baffac0 100644
--- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml
@@ -167,11 +167,21 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert
       etcdMembers:
       - name: us-test-1a
         volumeSize: 20
+      manager:
+        env:
+        - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION
+          value: 1d
+        - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
+          value: 30d
+        image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc
       version: 3.4.13
     main:
       etcdMembers:
       - name: us-test-1a
         volumeSize: 20
+      manager:
+        image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc
+        logLevel: 10
       version: 3.4.13
   kubeAPIServer:
     allowPrivileged: true