From c8a9b2fb3eabde19f199a26f5a1ce2bbe2e036cb Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 21 Jan 2021 09:57:02 +0200 Subject: [PATCH] Set default volume encryption to "true" for instances in AWS --- pkg/model/awsmodel/autoscalinggroup.go | 2 +- .../bastionadditional_user-data/kubernetes.tf | 6 +++--- tests/integration/update_cluster/compress/kubernetes.tf | 4 ++-- .../update_cluster/containerd-custom/cloudformation.json | 4 ++-- .../update_cluster/containerd/cloudformation.json | 4 ++-- .../update_cluster/docker-custom/cloudformation.json | 4 ++-- .../integration/update_cluster/existing_iam/kubernetes.tf | 8 ++++---- .../existing_iam_cloudformation/cloudformation.json | 4 ++-- .../integration/update_cluster/existing_sg/kubernetes.tf | 8 ++++---- .../update_cluster/externallb/cloudformation.json | 4 ++-- tests/integration/update_cluster/externallb/kubernetes.tf | 4 ++-- .../update_cluster/externalpolicies/kubernetes.tf | 4 ++-- tests/integration/update_cluster/ha/kubernetes.tf | 8 ++++---- .../update_cluster/launch_templates/cloudformation.json | 8 ++++---- .../update_cluster/launch_templates/kubernetes.tf | 8 ++++---- .../minimal-cloudformation/cloudformation.json | 4 ++-- .../update_cluster/minimal-gp3/cloudformation.json | 4 ++-- .../integration/update_cluster/minimal-gp3/kubernetes.tf | 4 ++-- .../update_cluster/minimal-json/kubernetes.tf.json | 4 ++-- tests/integration/update_cluster/minimal/kubernetes.tf | 4 ++-- .../update_cluster/mixed_instances/cloudformation.json | 8 ++++---- .../update_cluster/mixed_instances/kubernetes.tf | 8 ++++---- .../mixed_instances_spot/cloudformation.json | 8 ++++---- .../update_cluster/mixed_instances_spot/kubernetes.tf | 8 ++++---- .../update_cluster/private-shared-ip/cloudformation.json | 6 +++--- .../update_cluster/private-shared-ip/kubernetes.tf | 6 +++--- .../update_cluster/private-shared-subnet/kubernetes.tf | 6 +++--- .../update_cluster/privatecalico/cloudformation.json | 6 +++--- .../update_cluster/privatecalico/kubernetes.tf | 6 +++--- .../integration/update_cluster/privatecanal/kubernetes.tf | 6 +++--- .../update_cluster/privatecilium/cloudformation.json | 6 +++--- .../update_cluster/privatecilium/kubernetes.tf | 6 +++--- .../update_cluster/privatecilium2/cloudformation.json | 6 +++--- .../update_cluster/privatecilium2/kubernetes.tf | 6 +++--- .../privateciliumadvanced/cloudformation.json | 6 +++--- .../update_cluster/privateciliumadvanced/kubernetes.tf | 6 +++--- .../integration/update_cluster/privatedns1/kubernetes.tf | 6 +++--- .../integration/update_cluster/privatedns2/kubernetes.tf | 6 +++--- .../update_cluster/privateflannel/kubernetes.tf | 6 +++--- .../update_cluster/privatekopeio/kubernetes.tf | 6 +++--- .../integration/update_cluster/privateweave/kubernetes.tf | 6 +++--- .../integration/update_cluster/public-jwks/kubernetes.tf | 4 ++-- .../update_cluster/shared_subnet/kubernetes.tf | 4 ++-- tests/integration/update_cluster/shared_vpc/kubernetes.tf | 4 ++-- tests/integration/update_cluster/unmanaged/kubernetes.tf | 6 +++--- 45 files changed, 126 insertions(+), 126 deletions(-) diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index c046035266..b00aca5e68 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -47,7 +47,7 @@ const ( // DefaultVolumeDeleteOnTermination is the default volume behavior after instance termination DefaultVolumeDeleteOnTermination = true // DefaultVolumeEncryption is the default volume encryption behavior - DefaultVolumeEncryption = false + DefaultVolumeEncryption = true ) // AutoscalingGroupModelBuilder configures AutoscalingGroup objects diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index 5aaab8d371..0ba4b4e72f 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -504,7 +504,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -579,7 +579,7 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/compress/kubernetes.tf b/tests/integration/update_cluster/compress/kubernetes.tf index d98bc97b7f..046f02fb92 100644 --- a/tests/integration/update_cluster/compress/kubernetes.tf +++ b/tests/integration/update_cluster/compress/kubernetes.tf @@ -265,7 +265,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-compress-example-com" device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -339,7 +339,7 @@ resource "aws_launch_template" "nodes-compress-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json b/tests/integration/update_cluster/containerd-custom/cloudformation.json index 41fbc3d889..63f4d725ec 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json @@ -213,7 +213,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -339,7 +339,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/containerd/cloudformation.json b/tests/integration/update_cluster/containerd/cloudformation.json index 41fbc3d889..63f4d725ec 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json +++ b/tests/integration/update_cluster/containerd/cloudformation.json @@ -213,7 +213,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -339,7 +339,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json b/tests/integration/update_cluster/docker-custom/cloudformation.json index e60051261f..610ec1f7c3 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json @@ -213,7 +213,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -339,7 +339,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index 1c02a78fab..17e81c433f 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -385,7 +385,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existing-iam-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -460,7 +460,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -535,7 +535,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -610,7 +610,7 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json index 172e28c242..7b24422101 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json @@ -213,7 +213,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -337,7 +337,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 716bb7310e..0a49189bca 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -476,7 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existingsg-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -551,7 +551,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -626,7 +626,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -701,7 +701,7 @@ resource "aws_launch_template" "nodes-existingsg-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/externallb/cloudformation.json b/tests/integration/update_cluster/externallb/cloudformation.json index 3a7dcd509b..0972c04c17 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json +++ b/tests/integration/update_cluster/externallb/cloudformation.json @@ -228,7 +228,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -354,7 +354,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index 1c9f7e8818..a04becfe39 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -279,7 +279,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externallb-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -354,7 +354,7 @@ resource "aws_launch_template" "nodes-externallb-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/externalpolicies/kubernetes.tf b/tests/integration/update_cluster/externalpolicies/kubernetes.tf index fa4fed8d5d..9ce37e5ea6 100644 --- a/tests/integration/update_cluster/externalpolicies/kubernetes.tf +++ b/tests/integration/update_cluster/externalpolicies/kubernetes.tf @@ -347,7 +347,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externalpolicies-examp device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -428,7 +428,7 @@ resource "aws_launch_template" "nodes-externalpolicies-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/ha/kubernetes.tf b/tests/integration/update_cluster/ha/kubernetes.tf index 8c5c1325d3..10cf3c8750 100644 --- a/tests/integration/update_cluster/ha/kubernetes.tf +++ b/tests/integration/update_cluster/ha/kubernetes.tf @@ -447,7 +447,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -522,7 +522,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -597,7 +597,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -672,7 +672,7 @@ resource "aws_launch_template" "nodes-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/launch_templates/cloudformation.json b/tests/integration/update_cluster/launch_templates/cloudformation.json index 8acc65695a..f7dce572cf 100644 --- a/tests/integration/update_cluster/launch_templates/cloudformation.json +++ b/tests/integration/update_cluster/launch_templates/cloudformation.json @@ -298,7 +298,7 @@ "VolumeType": "gp2", "VolumeSize": 64, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -328,7 +328,7 @@ "VolumeType": "gp2", "VolumeSize": 64, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -358,7 +358,7 @@ "VolumeType": "gp2", "VolumeSize": 64, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -388,7 +388,7 @@ "VolumeType": "gp2", "VolumeSize": 128, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/launch_templates/kubernetes.tf b/tests/integration/update_cluster/launch_templates/kubernetes.tf index a781330c7d..cd878555c6 100644 --- a/tests/integration/update_cluster/launch_templates/kubernetes.tf +++ b/tests/integration/update_cluster/launch_templates/kubernetes.tf @@ -444,7 +444,7 @@ resource "aws_launch_configuration" "master-us-test-1a-masters-launchtemplates-e name_prefix = "master-us-test-1a.masters.launchtemplates.example.com-" root_block_device { delete_on_termination = true - encrypted = false + encrypted = true volume_size = 64 volume_type = "gp2" } @@ -465,7 +465,7 @@ resource "aws_launch_configuration" "master-us-test-1b-masters-launchtemplates-e name_prefix = "master-us-test-1b.masters.launchtemplates.example.com-" root_block_device { delete_on_termination = true - encrypted = false + encrypted = true volume_size = 64 volume_type = "gp2" } @@ -486,7 +486,7 @@ resource "aws_launch_configuration" "master-us-test-1c-masters-launchtemplates-e name_prefix = "master-us-test-1c.masters.launchtemplates.example.com-" root_block_device { delete_on_termination = true - encrypted = false + encrypted = true volume_size = 64 volume_type = "gp2" } @@ -507,7 +507,7 @@ resource "aws_launch_configuration" "nodes-launchtemplates-example-com" { name_prefix = "nodes.launchtemplates.example.com-" root_block_device { delete_on_termination = true - encrypted = false + encrypted = true volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json index 987e2961e3..f43526409d 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json @@ -213,7 +213,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -339,7 +339,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json b/tests/integration/update_cluster/minimal-gp3/cloudformation.json index efe1aaea85..0cbe9c8292 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json @@ -213,7 +213,7 @@ "Iops": 4000, "Throughput": 200, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -335,7 +335,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf index 5ef48f991a..e8539dbda7 100644 --- a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf @@ -277,7 +277,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 4000 throughput = 200 volume_size = 64 @@ -348,7 +348,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/minimal-json/kubernetes.tf.json b/tests/integration/update_cluster/minimal-json/kubernetes.tf.json index df24f2cac4..ed6df109d5 100644 --- a/tests/integration/update_cluster/minimal-json/kubernetes.tf.json +++ b/tests/integration/update_cluster/minimal-json/kubernetes.tf.json @@ -323,7 +323,7 @@ "iops": 3000, "throughput": 125, "delete_on_termination": true, - "encrypted": false + "encrypted": true } ] }, @@ -409,7 +409,7 @@ "iops": 3000, "throughput": 125, "delete_on_termination": true, - "encrypted": false + "encrypted": true } ] } diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index 0149a7eb9e..b6a308c6c4 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -275,7 +275,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -350,7 +350,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json b/tests/integration/update_cluster/mixed_instances/cloudformation.json index 21c42e5aba..d5532f0bcf 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json @@ -394,7 +394,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -520,7 +520,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -646,7 +646,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -772,7 +772,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/mixed_instances/kubernetes.tf b/tests/integration/update_cluster/mixed_instances/kubernetes.tf index b90613c14f..5a70d8f65d 100644 --- a/tests/integration/update_cluster/mixed_instances/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances/kubernetes.tf @@ -465,7 +465,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -540,7 +540,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -615,7 +615,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -690,7 +690,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json index 40adc663c1..2fa20922c0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json @@ -395,7 +395,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -521,7 +521,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -647,7 +647,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -773,7 +773,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf index 609a5530ad..ca30a2a113 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf @@ -465,7 +465,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -540,7 +540,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -615,7 +615,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -690,7 +690,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json b/tests/integration/update_cluster/private-shared-ip/cloudformation.json index c1c46f59e5..b2532d8dc9 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json @@ -257,7 +257,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -371,7 +371,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -497,7 +497,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf index ee99acc66e..a10232275b 100644 --- a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf @@ -413,7 +413,7 @@ resource "aws_launch_template" "bastion-private-shared-ip-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -480,7 +480,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-ip-exam device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -555,7 +555,7 @@ resource "aws_launch_template" "nodes-private-shared-ip-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index bcfd2b44b3..c3dd2ec401 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -408,7 +408,7 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -475,7 +475,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet- device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -550,7 +550,7 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json b/tests/integration/update_cluster/privatecalico/cloudformation.json index 289127a760..011fbbf3c2 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json @@ -319,7 +319,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -433,7 +433,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -559,7 +559,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index 85473e90f0..b121e54c26 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecalico-example- device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -578,7 +578,7 @@ resource "aws_launch_template" "nodes-privatecalico-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index 69befe3dbb..782d8f6d22 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecanal-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -578,7 +578,7 @@ resource "aws_launch_template" "nodes-privatecanal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json b/tests/integration/update_cluster/privatecilium/cloudformation.json index bee0a96452..9052067cac 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json @@ -319,7 +319,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -433,7 +433,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -559,7 +559,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index 7c562aed6f..4b653370c2 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example- device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -578,7 +578,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json b/tests/integration/update_cluster/privatecilium2/cloudformation.json index bee0a96452..9052067cac 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json @@ -319,7 +319,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -433,7 +433,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -559,7 +559,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 7c562aed6f..4b653370c2 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example- device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -578,7 +578,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json index 73ce3cb961..27e24daf40 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json @@ -319,7 +319,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], @@ -433,7 +433,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } }, { @@ -559,7 +559,7 @@ "Iops": 3000, "Throughput": 125, "DeleteOnTermination": true, - "Encrypted": false + "Encrypted": true } } ], diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index 8d2065c23f..f3e99993af 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -450,7 +450,7 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -517,7 +517,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateciliumadvanced- device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -592,7 +592,7 @@ resource "aws_launch_template" "nodes-privateciliumadvanced-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 260cd2a8ff..5fdf2c8842 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -486,7 +486,7 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -559,7 +559,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns1-example-co device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -640,7 +640,7 @@ resource "aws_launch_template" "nodes-privatedns1-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index ec22ac47d4..195211543a 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -422,7 +422,7 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -489,7 +489,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns2-example-co device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -564,7 +564,7 @@ resource "aws_launch_template" "nodes-privatedns2-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index 15bde30945..f62f393ad1 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateflannel-example device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -578,7 +578,7 @@ resource "aws_launch_template" "nodes-privateflannel-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index ac3038b892..f9924c3413 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -442,7 +442,7 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -509,7 +509,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatekopeio-example- device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -584,7 +584,7 @@ resource "aws_launch_template" "nodes-privatekopeio-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index 581d461ae1..c00c081bc1 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -436,7 +436,7 @@ resource "aws_launch_template" "bastion-privateweave-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateweave-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -578,7 +578,7 @@ resource "aws_launch_template" "nodes-privateweave-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/public-jwks/kubernetes.tf b/tests/integration/update_cluster/public-jwks/kubernetes.tf index b66ea4e77f..f4ddba6359 100644 --- a/tests/integration/update_cluster/public-jwks/kubernetes.tf +++ b/tests/integration/update_cluster/public-jwks/kubernetes.tf @@ -307,7 +307,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -382,7 +382,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/shared_subnet/kubernetes.tf b/tests/integration/update_cluster/shared_subnet/kubernetes.tf index fc54888823..f694bb05fb 100644 --- a/tests/integration/update_cluster/shared_subnet/kubernetes.tf +++ b/tests/integration/update_cluster/shared_subnet/kubernetes.tf @@ -261,7 +261,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedsubnet-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -336,7 +336,7 @@ resource "aws_launch_template" "nodes-sharedsubnet-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/shared_vpc/kubernetes.tf b/tests/integration/update_cluster/shared_vpc/kubernetes.tf index fd3171a359..d40b065a44 100644 --- a/tests/integration/update_cluster/shared_vpc/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc/kubernetes.tf @@ -261,7 +261,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedvpc-example-com" device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -336,7 +336,7 @@ resource "aws_launch_template" "nodes-sharedvpc-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128 diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index cd90927548..620dd321f8 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -413,7 +413,7 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 32 @@ -480,7 +480,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-unmanaged-example-com" device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 64 @@ -555,7 +555,7 @@ resource "aws_launch_template" "nodes-unmanaged-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true - encrypted = false + encrypted = true iops = 3000 throughput = 125 volume_size = 128