Set default volume type to "gp3" for etcd-manager volumes in AWS

pkg/model/master_volumes.go

@@ -40,7 +40,7 @@ import (
 
 const (
 	DefaultEtcdVolumeSize             = 20
-	DefaultAWSEtcdVolumeType          = "gp2"
+	DefaultAWSEtcdVolumeType          = "gp3"
 	DefaultAWSEtcdVolumeIonIops       = 100
 	DefaultAWSEtcdVolumeGp3Iops       = 3000
 	DefaultAWSEtcdVolumeGp3Throughput = 125
@@ -123,6 +123,9 @@ func (b *MasterVolumeBuilder) Build(c *fi.ModelBuilderContext) error {
 
 func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) error {
 	volumeType := fi.StringValue(m.VolumeType)
+	if volumeType == "" {
+		volumeType = DefaultAWSEtcdVolumeType
+	}
 	volumeIops := fi.Int32Value(m.VolumeIops)
 	volumeThroughput := fi.Int32Value(m.VolumeThroughput)
 	switch volumeType {
@@ -138,7 +141,7 @@ func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name strin
 			volumeThroughput = DefaultAWSEtcdVolumeGp3Throughput
 		}
 	default:
-		volumeType = DefaultAWSEtcdVolumeType
+		return fmt.Errorf("unknown volume type %q", volumeType)
 	}
 
 	// The tags are how protokube knows to mount the volume and use it for etcd

tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-bastionuserdata-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "bastionuserdata.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-bastionuserdata-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-bastionuserdata-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "bastionuserdata.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-bastionuserdata-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-bastionuserdata-example-com" {

tests/integration/update_cluster/complex/cloudformation.json

@@ -1125,7 +1125,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1164,7 +1166,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/complex/kubernetes.tf

@@ -206,6 +206,7 @@ resource "aws_autoscaling_group" "nodes-complex-example-com" {
 resource "aws_ebs_volume" "a-etcd-events-complex-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                         = "complex.example.com"
@@ -216,12 +217,13 @@ resource "aws_ebs_volume" "a-etcd-events-complex-example-com" {
     "k8s.io/role/master"                        = "1"
     "kubernetes.io/cluster/complex.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "a-etcd-main-complex-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                         = "complex.example.com"
@@ -232,7 +234,7 @@ resource "aws_ebs_volume" "a-etcd-main-complex-example-com" {
     "k8s.io/role/master"                        = "1"
     "kubernetes.io/cluster/complex.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-complex-example-com" {

tests/integration/update_cluster/compress/kubernetes.tf

@@ -184,6 +184,7 @@ resource "aws_autoscaling_group" "nodes-compress-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-compress-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                          = "compress.example.com"
@@ -192,12 +193,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-compress-example-com" {
     "k8s.io/role/master"                         = "1"
     "kubernetes.io/cluster/compress.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-compress-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                          = "compress.example.com"
@@ -206,7 +208,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-compress-example-com" {
     "k8s.io/role/master"                         = "1"
     "kubernetes.io/cluster/compress.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-compress-example-com" {

tests/integration/update_cluster/containerd-custom/cloudformation.json

@@ -775,7 +775,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -806,7 +808,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/containerd/cloudformation.json

@@ -775,7 +775,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -806,7 +808,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/docker-custom/cloudformation.json

@@ -775,7 +775,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -806,7 +808,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/existing_iam/kubernetes.tf

@@ -280,6 +280,7 @@ resource "aws_autoscaling_group" "nodes-existing-iam-example-com" {
 resource "aws_ebs_volume" "a-etcd-events-existing-iam-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "existing-iam.example.com"
@@ -288,12 +289,13 @@ resource "aws_ebs_volume" "a-etcd-events-existing-iam-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/existing-iam.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "a-etcd-main-existing-iam-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "existing-iam.example.com"
@@ -302,12 +304,13 @@ resource "aws_ebs_volume" "a-etcd-main-existing-iam-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/existing-iam.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "b-etcd-events-existing-iam-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "existing-iam.example.com"
@@ -316,12 +319,13 @@ resource "aws_ebs_volume" "b-etcd-events-existing-iam-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/existing-iam.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "b-etcd-main-existing-iam-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "existing-iam.example.com"
@@ -330,12 +334,13 @@ resource "aws_ebs_volume" "b-etcd-main-existing-iam-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/existing-iam.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "c-etcd-events-existing-iam-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "existing-iam.example.com"
@@ -344,12 +349,13 @@ resource "aws_ebs_volume" "c-etcd-events-existing-iam-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/existing-iam.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "c-etcd-main-existing-iam-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "existing-iam.example.com"
@@ -358,7 +364,7 @@ resource "aws_ebs_volume" "c-etcd-main-existing-iam-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/existing-iam.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_internet_gateway" "existing-iam-example-com" {

tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json

@@ -771,7 +771,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -802,7 +804,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/existing_sg/kubernetes.tf

@@ -303,6 +303,7 @@ resource "aws_autoscaling_group" "nodes-existingsg-example-com" {
 resource "aws_ebs_volume" "a-etcd-events-existingsg-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "existingsg.example.com"
@@ -311,12 +312,13 @@ resource "aws_ebs_volume" "a-etcd-events-existingsg-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/existingsg.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "a-etcd-main-existingsg-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "existingsg.example.com"
@@ -325,12 +327,13 @@ resource "aws_ebs_volume" "a-etcd-main-existingsg-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/existingsg.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "b-etcd-events-existingsg-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "existingsg.example.com"
@@ -339,12 +342,13 @@ resource "aws_ebs_volume" "b-etcd-events-existingsg-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/existingsg.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "b-etcd-main-existingsg-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "existingsg.example.com"
@@ -353,12 +357,13 @@ resource "aws_ebs_volume" "b-etcd-main-existingsg-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/existingsg.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "c-etcd-events-existingsg-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "existingsg.example.com"
@@ -367,12 +372,13 @@ resource "aws_ebs_volume" "c-etcd-events-existingsg-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/existingsg.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "c-etcd-main-existingsg-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "existingsg.example.com"
@@ -381,7 +387,7 @@ resource "aws_ebs_volume" "c-etcd-main-existingsg-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/existingsg.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_elb" "api-existingsg-example-com" {

tests/integration/update_cluster/externallb/cloudformation.json

@@ -790,7 +790,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -821,7 +823,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/externallb/kubernetes.tf

@@ -188,6 +188,7 @@ resource "aws_autoscaling_group" "nodes-externallb-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-externallb-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "externallb.example.com"
@@ -196,12 +197,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-externallb-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/externallb.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-externallb-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                            = "externallb.example.com"
@@ -210,7 +212,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-externallb-example-com" {
     "k8s.io/role/master"                           = "1"
     "kubernetes.io/cluster/externallb.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-externallb-example-com" {

tests/integration/update_cluster/externalpolicies/kubernetes.tf

@@ -206,6 +206,7 @@ resource "aws_autoscaling_group" "nodes-externalpolicies-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-externalpolicies-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                  = "externalpolicies.example.com"
@@ -216,12 +217,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-externalpolicies-example-com"
     "k8s.io/role/master"                                 = "1"
     "kubernetes.io/cluster/externalpolicies.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-externalpolicies-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                  = "externalpolicies.example.com"
@@ -232,7 +234,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-externalpolicies-example-com" {
     "k8s.io/role/master"                                 = "1"
     "kubernetes.io/cluster/externalpolicies.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_elb" "api-externalpolicies-example-com" {

tests/integration/update_cluster/ha/kubernetes.tf

@@ -300,6 +300,7 @@ resource "aws_autoscaling_group" "nodes-ha-example-com" {
 resource "aws_ebs_volume" "a-etcd-events-ha-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                    = "ha.example.com"
@@ -308,12 +309,13 @@ resource "aws_ebs_volume" "a-etcd-events-ha-example-com" {
     "k8s.io/role/master"                   = "1"
     "kubernetes.io/cluster/ha.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "a-etcd-main-ha-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                    = "ha.example.com"
@@ -322,12 +324,13 @@ resource "aws_ebs_volume" "a-etcd-main-ha-example-com" {
     "k8s.io/role/master"                   = "1"
     "kubernetes.io/cluster/ha.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "b-etcd-events-ha-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                    = "ha.example.com"
@@ -336,12 +339,13 @@ resource "aws_ebs_volume" "b-etcd-events-ha-example-com" {
     "k8s.io/role/master"                   = "1"
     "kubernetes.io/cluster/ha.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "b-etcd-main-ha-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                    = "ha.example.com"
@@ -350,12 +354,13 @@ resource "aws_ebs_volume" "b-etcd-main-ha-example-com" {
     "k8s.io/role/master"                   = "1"
     "kubernetes.io/cluster/ha.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "c-etcd-events-ha-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                    = "ha.example.com"
@@ -364,12 +369,13 @@ resource "aws_ebs_volume" "c-etcd-events-ha-example-com" {
     "k8s.io/role/master"                   = "1"
     "kubernetes.io/cluster/ha.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "c-etcd-main-ha-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                    = "ha.example.com"
@@ -378,7 +384,7 @@ resource "aws_ebs_volume" "c-etcd-main-ha-example-com" {
     "k8s.io/role/master"                   = "1"
     "kubernetes.io/cluster/ha.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-ha-example-com" {

tests/integration/update_cluster/launch_templates/cloudformation.json

@@ -872,7 +872,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -903,7 +905,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -934,7 +938,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1b",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -965,7 +971,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1b",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -996,7 +1004,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1c",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1027,7 +1037,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1c",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/launch_templates/kubernetes.tf

@@ -289,6 +289,7 @@ resource "aws_autoscaling_group" "nodes-launchtemplates-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-launchtemplates-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "launchtemplates.example.com"
@@ -297,12 +298,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-launchtemplates-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/launchtemplates.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-launchtemplates-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "launchtemplates.example.com"
@@ -311,12 +313,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-launchtemplates-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/launchtemplates.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1b-etcd-events-launchtemplates-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "launchtemplates.example.com"
@@ -325,12 +328,13 @@ resource "aws_ebs_volume" "us-test-1b-etcd-events-launchtemplates-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/launchtemplates.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1b-etcd-main-launchtemplates-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "launchtemplates.example.com"
@@ -339,12 +343,13 @@ resource "aws_ebs_volume" "us-test-1b-etcd-main-launchtemplates-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/launchtemplates.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1c-etcd-events-launchtemplates-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "launchtemplates.example.com"
@@ -353,12 +358,13 @@ resource "aws_ebs_volume" "us-test-1c-etcd-events-launchtemplates-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/launchtemplates.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1c-etcd-main-launchtemplates-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                 = "launchtemplates.example.com"
@@ -367,7 +373,7 @@ resource "aws_ebs_volume" "us-test-1c-etcd-main-launchtemplates-example-com" {
     "k8s.io/role/master"                                = "1"
     "kubernetes.io/cluster/launchtemplates.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-launchtemplates-example-com" {

tests/integration/update_cluster/minimal-cloudformation/cloudformation.json

@@ -775,7 +775,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -806,7 +808,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/minimal-json/kubernetes.tf.json

@@ -220,7 +220,8 @@
       "us-test-1a-etcd-events-minimal-json-example-com": {
         "availability_zone": "us-test-1a",
         "size": 20,
-        "type": "gp2",
+        "type": "gp3",
+        "iops": 3000,
         "encrypted": false,
         "tags": {
           "KubernetesCluster": "minimal-json.example.com",
@@ -233,7 +234,8 @@
       "us-test-1a-etcd-main-minimal-json-example-com": {
         "availability_zone": "us-test-1a",
         "size": 20,
-        "type": "gp2",
+        "type": "gp3",
+        "iops": 3000,
         "encrypted": false,
         "tags": {
           "KubernetesCluster": "minimal-json.example.com",

tests/integration/update_cluster/minimal/kubernetes.tf

@@ -184,6 +184,7 @@ resource "aws_autoscaling_group" "nodes-minimal-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-minimal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                         = "minimal.example.com"
@@ -192,12 +193,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-minimal-example-com" {
     "k8s.io/role/master"                        = "1"
     "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                         = "minimal.example.com"
@@ -206,7 +208,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-example-com" {
     "k8s.io/role/master"                        = "1"
     "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-minimal-example-com" {

tests/integration/update_cluster/mixed_instances/cloudformation.json

@@ -1294,7 +1294,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1325,7 +1327,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1356,7 +1360,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1b",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1387,7 +1393,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1b",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1418,7 +1426,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1c",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1449,7 +1459,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1c",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/mixed_instances/kubernetes.tf

@@ -318,6 +318,7 @@ resource "aws_autoscaling_group" "nodes-mixedinstances-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-mixedinstances-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -326,12 +327,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-mixedinstances-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -340,12 +342,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1b-etcd-events-mixedinstances-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -354,12 +357,13 @@ resource "aws_ebs_volume" "us-test-1b-etcd-events-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1b-etcd-main-mixedinstances-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -368,12 +372,13 @@ resource "aws_ebs_volume" "us-test-1b-etcd-main-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1c-etcd-events-mixedinstances-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -382,12 +387,13 @@ resource "aws_ebs_volume" "us-test-1c-etcd-events-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1c-etcd-main-mixedinstances-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -396,7 +402,7 @@ resource "aws_ebs_volume" "us-test-1c-etcd-main-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-mixedinstances-example-com" {

tests/integration/update_cluster/mixed_instances_spot/cloudformation.json

@@ -1295,7 +1295,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1326,7 +1328,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1357,7 +1361,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1b",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1388,7 +1394,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1b",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1419,7 +1427,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1c",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1450,7 +1460,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1c",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf

@@ -318,6 +318,7 @@ resource "aws_autoscaling_group" "nodes-mixedinstances-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-mixedinstances-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -326,12 +327,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-mixedinstances-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -340,12 +342,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1b-etcd-events-mixedinstances-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -354,12 +357,13 @@ resource "aws_ebs_volume" "us-test-1b-etcd-events-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1b-etcd-main-mixedinstances-example-com" {
   availability_zone = "us-test-1b"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -368,12 +372,13 @@ resource "aws_ebs_volume" "us-test-1b-etcd-main-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1c-etcd-events-mixedinstances-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -382,12 +387,13 @@ resource "aws_ebs_volume" "us-test-1c-etcd-events-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1c-etcd-main-mixedinstances-example-com" {
   availability_zone = "us-test-1c"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "mixedinstances.example.com"
@@ -396,7 +402,7 @@ resource "aws_ebs_volume" "us-test-1c-etcd-main-mixedinstances-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/mixedinstances.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-mixedinstances-example-com" {

tests/integration/update_cluster/private-shared-ip/cloudformation.json

@@ -1137,7 +1137,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1168,7 +1170,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/private-shared-ip/kubernetes.tf

@@ -259,6 +259,7 @@ resource "aws_autoscaling_group" "nodes-private-shared-ip-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-private-shared-ip-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                   = "private-shared-ip.example.com"
@@ -267,12 +268,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-private-shared-ip-example-com"
     "k8s.io/role/master"                                  = "1"
     "kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-private-shared-ip-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                   = "private-shared-ip.example.com"
@@ -281,7 +283,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-private-shared-ip-example-com" {
     "k8s.io/role/master"                                  = "1"
     "kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_elb" "api-private-shared-ip-example-com" {

tests/integration/update_cluster/private-shared-subnet/kubernetes.tf

@@ -254,6 +254,7 @@ resource "aws_autoscaling_group" "nodes-private-shared-subnet-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-private-shared-subnet-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                       = "private-shared-subnet.example.com"
@@ -262,12 +263,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-private-shared-subnet-example-
     "k8s.io/role/master"                                      = "1"
     "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-private-shared-subnet-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                       = "private-shared-subnet.example.com"
@@ -276,7 +278,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-private-shared-subnet-example-co
     "k8s.io/role/master"                                      = "1"
     "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_elb" "api-private-shared-subnet-example-com" {

tests/integration/update_cluster/privatecalico/cloudformation.json

@@ -1282,7 +1282,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1313,7 +1315,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/privatecalico/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privatecalico-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecalico-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatecalico.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecalico-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatecalico.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecalico-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatecalico.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecalico-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatecalico.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privatecalico-example-com" {

tests/integration/update_cluster/privatecanal/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privatecanal-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecanal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "privatecanal.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecanal-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/privatecanal.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecanal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "privatecanal.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecanal-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/privatecanal.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privatecanal-example-com" {

tests/integration/update_cluster/privatecilium/cloudformation.json

@@ -1268,7 +1268,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1299,7 +1301,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/privatecilium/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privatecilium-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecilium-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatecilium.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecilium-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatecilium.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatecilium.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatecilium.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privatecilium-example-com" {

tests/integration/update_cluster/privatecilium2/cloudformation.json

@@ -1268,7 +1268,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1299,7 +1301,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/privatecilium2/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privatecilium-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecilium-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatecilium.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecilium-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatecilium.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatecilium.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatecilium.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privatecilium-example-com" {

tests/integration/update_cluster/privateciliumadvanced/cloudformation.json

@@ -1268,7 +1268,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1299,7 +1301,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {
@@ -1330,7 +1334,9 @@
       "Properties": {
         "AvailabilityZone": "us-test-1a",
         "Size": 20,
-        "VolumeType": "gp2",
+        "VolumeType": "gp3",
+        "Iops": 3000,
+        "Throughput": 125,
         "Encrypted": false,
         "Tags": [
           {

tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privateciliumadvanced-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-cilium-privateciliumadvanced-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                       = "privateciliumadvanced.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-cilium-privateciliumadvanced-example-
     "k8s.io/role/master"                                      = "1"
     "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privateciliumadvanced-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                       = "privateciliumadvanced.example.com"
@@ -286,12 +288,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privateciliumadvanced-example-
     "k8s.io/role/master"                                      = "1"
     "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privateciliumadvanced-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                       = "privateciliumadvanced.example.com"
@@ -300,7 +303,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateciliumadvanced-example-co
     "k8s.io/role/master"                                      = "1"
     "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privateciliumadvanced-example-com" {

tests/integration/update_cluster/privatedns1/kubernetes.tf

@@ -294,6 +294,7 @@ resource "aws_autoscaling_group" "nodes-privatedns1-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns1-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                             = "privatedns1.example.com"
@@ -304,12 +305,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns1-example-com" {
     "k8s.io/role/master"                            = "1"
     "kubernetes.io/cluster/privatedns1.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns1-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                             = "privatedns1.example.com"
@@ -320,7 +322,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns1-example-com" {
     "k8s.io/role/master"                            = "1"
     "kubernetes.io/cluster/privatedns1.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privatedns1-example-com" {

tests/integration/update_cluster/privatedns2/kubernetes.tf

@@ -259,6 +259,7 @@ resource "aws_autoscaling_group" "nodes-privatedns2-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns2-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                             = "privatedns2.example.com"
@@ -267,12 +268,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns2-example-com" {
     "k8s.io/role/master"                            = "1"
     "kubernetes.io/cluster/privatedns2.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns2-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                             = "privatedns2.example.com"
@@ -281,7 +283,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns2-example-com" {
     "k8s.io/role/master"                            = "1"
     "kubernetes.io/cluster/privatedns2.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privatedns2-example-com" {

tests/integration/update_cluster/privateflannel/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privateflannel-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privateflannel-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "privateflannel.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privateflannel-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/privateflannel.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privateflannel-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                                = "privateflannel.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateflannel-example-com" {
     "k8s.io/role/master"                               = "1"
     "kubernetes.io/cluster/privateflannel.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privateflannel-example-com" {

tests/integration/update_cluster/privatekopeio/kubernetes.tf

@@ -279,6 +279,7 @@ resource "aws_autoscaling_group" "nodes-privatekopeio-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privatekopeio-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatekopeio.example.com"
@@ -287,12 +288,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatekopeio-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatekopeio.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privatekopeio-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                               = "privatekopeio.example.com"
@@ -301,7 +303,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatekopeio-example-com" {
     "k8s.io/role/master"                              = "1"
     "kubernetes.io/cluster/privatekopeio.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_elb" "api-privatekopeio-example-com" {

tests/integration/update_cluster/privateweave/kubernetes.tf

@@ -264,6 +264,7 @@ resource "aws_autoscaling_group" "nodes-privateweave-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-privateweave-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "privateweave.example.com"
@@ -272,12 +273,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privateweave-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-privateweave-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "privateweave.example.com"
@@ -286,7 +288,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateweave-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_eip" "us-test-1a-privateweave-example-com" {

tests/integration/update_cluster/public-jwks/kubernetes.tf

@@ -194,6 +194,7 @@ resource "aws_autoscaling_group" "nodes-minimal-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-minimal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                         = "minimal.example.com"
@@ -202,12 +203,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-minimal-example-com" {
     "k8s.io/role/master"                        = "1"
     "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                         = "minimal.example.com"
@@ -216,7 +218,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-example-com" {
     "k8s.io/role/master"                        = "1"
     "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-minimal-example-com" {

tests/integration/update_cluster/shared_subnet/kubernetes.tf

@@ -179,6 +179,7 @@ resource "aws_autoscaling_group" "nodes-sharedsubnet-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedsubnet-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "sharedsubnet.example.com"
@@ -187,12 +188,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedsubnet-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/sharedsubnet.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedsubnet-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                              = "sharedsubnet.example.com"
@@ -201,7 +203,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedsubnet-example-com" {
     "k8s.io/role/master"                             = "1"
     "kubernetes.io/cluster/sharedsubnet.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-sharedsubnet-example-com" {

tests/integration/update_cluster/shared_vpc/kubernetes.tf

@@ -179,6 +179,7 @@ resource "aws_autoscaling_group" "nodes-sharedvpc-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedvpc-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                           = "sharedvpc.example.com"
@@ -187,12 +188,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedvpc-example-com" {
     "k8s.io/role/master"                          = "1"
     "kubernetes.io/cluster/sharedvpc.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedvpc-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                           = "sharedvpc.example.com"
@@ -201,7 +203,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedvpc-example-com" {
     "k8s.io/role/master"                          = "1"
     "kubernetes.io/cluster/sharedvpc.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_iam_instance_profile" "masters-sharedvpc-example-com" {

tests/integration/update_cluster/unmanaged/kubernetes.tf

@@ -259,6 +259,7 @@ resource "aws_autoscaling_group" "nodes-unmanaged-example-com" {
 resource "aws_ebs_volume" "us-test-1a-etcd-events-unmanaged-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                           = "unmanaged.example.com"
@@ -267,12 +268,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-unmanaged-example-com" {
     "k8s.io/role/master"                          = "1"
     "kubernetes.io/cluster/unmanaged.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_ebs_volume" "us-test-1a-etcd-main-unmanaged-example-com" {
   availability_zone = "us-test-1a"
   encrypted         = false
+  iops              = 3000
   size              = 20
   tags = {
     "KubernetesCluster"                           = "unmanaged.example.com"
@@ -281,7 +283,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-unmanaged-example-com" {
     "k8s.io/role/master"                          = "1"
     "kubernetes.io/cluster/unmanaged.example.com" = "owned"
   }
-  type = "gp2"
+  type = "gp3"
 }
 
 resource "aws_elb" "api-unmanaged-example-com" {