From d64cfba3656f1d35bb8386b4d8e10e00847e73fb Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Sat, 1 May 2021 12:06:22 +0300
Subject: [PATCH] Mark control-plane node for update when etcd volume size
 changes

etcd-manager expands the data volume on restart to the max available.
---
 pkg/model/bootstrapscript.go                  | 21 +++++++++++--------
 .../minimal-gp3/cloudformation.json           |  2 +-
 .../cloudformation.json.extracted.yaml        |  6 ++++++
 ...t-1a.masters.minimal.example.com_user_data |  6 ++++++
 .../minimal-gp3/in-v1alpha2.yaml              |  2 ++
 .../update_cluster/minimal-gp3/kubernetes.tf  |  2 +-
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
index abc02be7ab..fcfa092533 100644
--- a/pkg/model/bootstrapscript.go
+++ b/pkg/model/bootstrapscript.go
@@ -326,16 +326,19 @@ func (b *BootstrapScript) Run(c *fi.Context) error {
 
 				for _, etcdCluster := range cs.EtcdClusters {
 					c := kops.EtcdClusterSpec{
-						Image:   etcdCluster.Image,
-						Version: etcdCluster.Version,
+						Image:         etcdCluster.Image,
+						Version:       etcdCluster.Version,
+						CPURequest:    etcdCluster.CPURequest,
+						MemoryRequest: etcdCluster.MemoryRequest,
 					}
-					// if the user has not specified memory or cpu allotments for etcd, do not
-					// apply one.  Described in PR #6313.
-					if etcdCluster.CPURequest != nil {
-						c.CPURequest = etcdCluster.CPURequest
-					}
-					if etcdCluster.MemoryRequest != nil {
-						c.MemoryRequest = etcdCluster.MemoryRequest
+					for _, etcdMember := range etcdCluster.Members {
+						if fi.StringValue(etcdMember.InstanceGroup) == b.ig.Name && etcdMember.VolumeSize != nil {
+							m := kops.EtcdMemberSpec{
+								Name:       etcdMember.Name,
+								VolumeSize: etcdMember.VolumeSize,
+							}
+							c.Members = append(c.Members, m)
+						}
 					}
 					spec["etcdClusters"].(map[string]kops.EtcdClusterSpec)[etcdCluster.Name] = c
 				}
diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json b/tests/integration/update_cluster/minimal-gp3/cloudformation.json
index 0f892a356d..93e862eb22 100644
--- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json
+++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json
@@ -829,7 +829,7 @@
       "Type": "AWS::EC2::Volume",
       "Properties": {
         "AvailabilityZone": "us-test-1a",
-        "Size": 20,
+        "Size": 50,
         "VolumeType": "gp3",
         "Iops": 5000,
         "Throughput": 125,
diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml
index 164f22daad..bc6f634306 100644
--- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml
@@ -164,8 +164,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
   encryptionConfig: null
   etcdClusters:
     events:
+      etcdMembers:
+      - name: us-test-1a
+        volumeSize: 20
       version: 3.4.13
     main:
+      etcdMembers:
+      - name: us-test-1a
+        volumeSize: 50
       version: 3.4.13
   kubeAPIServer:
     allowPrivileged: true
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 73e0f52925..3808215576 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -163,8 +163,14 @@ docker:
 encryptionConfig: null
 etcdClusters:
   events:
+    etcdMembers:
+    - name: us-test-1a
+      volumeSize: 20
     version: 3.4.13
   main:
+    etcdMembers:
+    - name: us-test-1a
+      volumeSize: 50
     version: 3.4.13
 kubeAPIServer:
   allowPrivileged: true
diff --git a/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml
index ba6bfbc81c..1f724ea9a9 100644
--- a/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml
+++ b/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml
@@ -14,12 +14,14 @@ spec:
     - instanceGroup: master-us-test-1a
       name: us-test-1a
       volumeIops: 5000
+      volumeSize: 50
       volumeThroughput: 125
       volumeType: gp3
     name: main
   - etcdMembers:
     - instanceGroup: master-us-test-1a
       name: us-test-1a
+      volumeSize: 20
       volumeType: gp3
     name: events
   iam: {}
diff --git a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf
index efca7c1d9b..38fa321f32 100644
--- a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf
+++ b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf
@@ -211,7 +211,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
   iops              = 5000
-  size              = 20
+  size              = 50
   tags = {
     "KubernetesCluster"                         = "minimal.example.com"
     "Name"                                      = "us-test-1a.etcd-main.minimal.example.com"