From fc2b5c9e994018ef23840a18de3e09d5d427e10f Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 3 Dec 2020 11:26:58 +0200 Subject: [PATCH] Update expected outputs of integration tests --- .../bastionadditional_user-data/kubernetes.tf | 3 +++ .../update_cluster/complex/cloudformation.json | 3 ++- .../integration/update_cluster/complex/kubernetes.tf | 1 + .../containerd-cloudformation/cloudformation.json | 6 ++++-- .../update_cluster/existing_iam/kubernetes.tf | 4 ++++ .../existing_iam_cloudformation/cloudformation.json | 6 ++++-- .../update_cluster/existing_sg/kubernetes.tf | 4 ++++ .../update_cluster/externallb/cloudformation.json | 6 ++++-- .../update_cluster/externallb/kubernetes.tf | 2 ++ .../update_cluster/externalpolicies/kubernetes.tf | 2 ++ tests/integration/update_cluster/ha/kubernetes.tf | 4 ++++ .../launch_templates/cloudformation.json | 12 ++++++++---- .../update_cluster/launch_templates/kubernetes.tf | 4 ++++ .../minimal-cloudformation/cloudformation.json | 6 ++++-- .../update_cluster/minimal-json/kubernetes.tf.json | 6 ++++-- .../integration/update_cluster/minimal/kubernetes.tf | 2 ++ .../mixed_instances/cloudformation.json | 12 ++++++++---- .../update_cluster/mixed_instances/kubernetes.tf | 4 ++++ .../mixed_instances_spot/cloudformation.json | 12 ++++++++---- .../mixed_instances_spot/kubernetes.tf | 4 ++++ .../private-shared-subnet/kubernetes.tf | 3 +++ .../update_cluster/privatecalico/cloudformation.json | 9 ++++++--- .../update_cluster/privatecalico/kubernetes.tf | 3 +++ .../update_cluster/privatecanal/kubernetes.tf | 3 +++ .../update_cluster/privatecilium/cloudformation.json | 9 ++++++--- .../update_cluster/privatecilium/kubernetes.tf | 3 +++ .../privatecilium2/cloudformation.json | 9 ++++++--- .../update_cluster/privatecilium2/kubernetes.tf | 3 +++ .../privateciliumadvanced/cloudformation.json | 9 ++++++--- .../privateciliumadvanced/kubernetes.tf | 3 +++ .../update_cluster/privatedns1/kubernetes.tf | 3 +++ .../update_cluster/privatedns2/kubernetes.tf | 3 +++ .../update_cluster/privateflannel/kubernetes.tf | 3 +++ .../update_cluster/privatekopeio/kubernetes.tf | 3 +++ .../update_cluster/privateweave/kubernetes.tf | 3 +++ .../update_cluster/public-jwks/kubernetes.tf | 2 ++ .../update_cluster/shared_subnet/kubernetes.tf | 2 ++ .../update_cluster/shared_vpc/kubernetes.tf | 2 ++ .../update_cluster/unmanaged/kubernetes.tf | 3 +++ 39 files changed, 146 insertions(+), 35 deletions(-) diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index 14c886d586976..975f2b7b0543d 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -476,6 +477,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -540,6 +542,7 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/complex/cloudformation.json b/tests/integration/update_cluster/complex/cloudformation.json index af1957a3fa3b6..1c3d329b5f143 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json +++ b/tests/integration/update_cluster/complex/cloudformation.json @@ -388,7 +388,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 20, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index ceebe1522bf83..d58473fa0c515 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -360,6 +360,7 @@ resource "aws_launch_template" "nodes-complex-example-com" { device_name = "/dev/xvdd" ebs { delete_on_termination = true + encrypted = false volume_size = 20 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json index 29ebd4416b82b..00d89362a3b87 100644 --- a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json @@ -205,7 +205,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -316,7 +317,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index c1bd348d28ff4..1497916758607 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -370,6 +370,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 volume_size = 64 volume_type = "gp2" } @@ -434,6 +435,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 volume_size = 64 volume_type = "gp2" } @@ -498,6 +500,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 volume_size = 64 volume_type = "gp2" } @@ -562,6 +565,7 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json index 6b477cc5a026e..faa4531bb507d 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json @@ -205,7 +205,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -314,7 +315,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 025b222dc16e5..5a4989cfa9c1d 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -451,6 +451,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existingsg-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -515,6 +516,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -579,6 +581,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -643,6 +646,7 @@ resource "aws_launch_template" "nodes-existingsg-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/externallb/cloudformation.json b/tests/integration/update_cluster/externallb/cloudformation.json index 4b8265a515910..47188fa4821a5 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json +++ b/tests/integration/update_cluster/externallb/cloudformation.json @@ -220,7 +220,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -331,7 +332,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index a7d531717754b..3046851954c95 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -264,6 +264,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externallb-example-com device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -328,6 +329,7 @@ resource "aws_launch_template" "nodes-externallb-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/externalpolicies/kubernetes.tf b/tests/integration/update_cluster/externalpolicies/kubernetes.tf index c8b990846a2a6..ec1445717d9af 100644 --- a/tests/integration/update_cluster/externalpolicies/kubernetes.tf +++ b/tests/integration/update_cluster/externalpolicies/kubernetes.tf @@ -328,6 +328,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externalpolicies-examp device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -398,6 +399,7 @@ resource "aws_launch_template" "nodes-externalpolicies-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/ha/kubernetes.tf b/tests/integration/update_cluster/ha/kubernetes.tf index dfe29d079a195..97dd3604a7734 100644 --- a/tests/integration/update_cluster/ha/kubernetes.tf +++ b/tests/integration/update_cluster/ha/kubernetes.tf @@ -422,6 +422,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -486,6 +487,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -550,6 +552,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -614,6 +617,7 @@ resource "aws_launch_template" "nodes-ha-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/launch_templates/cloudformation.json b/tests/integration/update_cluster/launch_templates/cloudformation.json index 6a4281f2c977a..480779ae5cd83 100644 --- a/tests/integration/update_cluster/launch_templates/cloudformation.json +++ b/tests/integration/update_cluster/launch_templates/cloudformation.json @@ -282,7 +282,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -311,7 +312,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -340,7 +342,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -369,7 +372,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/launch_templates/kubernetes.tf b/tests/integration/update_cluster/launch_templates/kubernetes.tf index ee675ac9b40e7..10caa6efce4a9 100644 --- a/tests/integration/update_cluster/launch_templates/kubernetes.tf +++ b/tests/integration/update_cluster/launch_templates/kubernetes.tf @@ -419,6 +419,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 volume_size = 64 volume_type = "gp2" } @@ -439,6 +440,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 volume_size = 64 volume_type = "gp2" } @@ -459,6 +461,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 volume_size = 64 volume_type = "gp2" } @@ -479,6 +482,7 @@ resource "aws_launch_configuration" "nodes-launchtemplates-example-com" { name_prefix = "nodes.launchtemplates.example.com-" root_block_device { delete_on_termination = true + encrypted = false 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 066fd9dd13b76..3be00cbfe1ed5 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json @@ -205,7 +205,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -316,7 +317,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/minimal-json/kubernetes.tf.json b/tests/integration/update_cluster/minimal-json/kubernetes.tf.json index 6691f2c09167f..dd117ae2bb564 100644 --- a/tests/integration/update_cluster/minimal-json/kubernetes.tf.json +++ b/tests/integration/update_cluster/minimal-json/kubernetes.tf.json @@ -305,7 +305,8 @@ { "volume_type": "gp2", "volume_size": 64, - "delete_on_termination": true + "delete_on_termination": true, + "encrypted": false } ] }, @@ -380,7 +381,8 @@ { "volume_type": "gp2", "volume_size": 128, - "delete_on_termination": true + "delete_on_termination": true, + "encrypted": false } ] } diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index 58da12bcea4cf..b822ba626a1f0 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -260,6 +260,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -324,6 +325,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json b/tests/integration/update_cluster/mixed_instances/cloudformation.json index 892a76fb24a46..24d0906367d54 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json @@ -376,7 +376,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -487,7 +488,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -598,7 +600,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -709,7 +712,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/mixed_instances/kubernetes.tf b/tests/integration/update_cluster/mixed_instances/kubernetes.tf index 2dd384a781922..2a195e71267a8 100644 --- a/tests/integration/update_cluster/mixed_instances/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances/kubernetes.tf @@ -440,6 +440,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -504,6 +505,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -568,6 +570,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -632,6 +635,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json index fb1c07ef2f78d..9dfa051f03e2b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json @@ -377,7 +377,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -488,7 +489,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -599,7 +601,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -710,7 +713,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf index e097def665aa9..d239f51406504 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf @@ -440,6 +440,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -504,6 +505,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -568,6 +570,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -632,6 +635,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index 7a2a32ae73ba3..90c9e48a4cb78 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -388,6 +388,7 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -447,6 +448,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet- device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -511,6 +513,7 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json b/tests/integration/update_cluster/privatecalico/cloudformation.json index 98f18806e4024..f866c682f5db7 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json @@ -311,7 +311,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 32, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -418,7 +419,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -529,7 +531,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index c1e2d3daf02db..42451b2ed24f6 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -475,6 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecalico-example- device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -539,6 +541,7 @@ resource "aws_launch_template" "nodes-privatecalico-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index b7b345939d70f..e8f34f9523eaf 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -475,6 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecanal-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -539,6 +541,7 @@ resource "aws_launch_template" "nodes-privatecanal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json b/tests/integration/update_cluster/privatecilium/cloudformation.json index 20b85a5244560..b8932b1bcff75 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json @@ -311,7 +311,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 32, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -418,7 +419,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -529,7 +531,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index 0415c7e8b2bd3..02f5c89d805f7 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -475,6 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example- device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -539,6 +541,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json b/tests/integration/update_cluster/privatecilium2/cloudformation.json index 20b85a5244560..b8932b1bcff75 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json @@ -311,7 +311,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 32, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -418,7 +419,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -529,7 +531,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 0415c7e8b2bd3..02f5c89d805f7 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -475,6 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example- device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -539,6 +541,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json index 600bd5c0c9b1f..40022ae3ee643 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json @@ -311,7 +311,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 32, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], @@ -418,7 +419,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 64, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } }, { @@ -529,7 +531,8 @@ "Ebs": { "VolumeType": "gp2", "VolumeSize": 128, - "DeleteOnTermination": true + "DeleteOnTermination": true, + "Encrypted": false } } ], diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index ce0520dd6506f..a2606de43ea76 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -430,6 +430,7 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -489,6 +490,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateciliumadvanced- device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -553,6 +555,7 @@ resource "aws_launch_template" "nodes-privateciliumadvanced-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 989e7111bc0e6..a44dc6511b772 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -460,6 +460,7 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -525,6 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns1-example-co device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -595,6 +597,7 @@ resource "aws_launch_template" "nodes-privatedns1-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index 7707526a2469a..3325f4508ed36 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -402,6 +402,7 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -461,6 +462,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns2-example-co device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -525,6 +527,7 @@ resource "aws_launch_template" "nodes-privatedns2-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index 5dfe1e07fa114..bda6182aa7eee 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -475,6 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateflannel-example device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -539,6 +541,7 @@ resource "aws_launch_template" "nodes-privateflannel-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index ee05e60dc2cd0..21b92d73e8126 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -422,6 +422,7 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -481,6 +482,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatekopeio-example- device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -545,6 +547,7 @@ resource "aws_launch_template" "nodes-privatekopeio-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index f6ef2514feae3..a9f38e2f823e3 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -416,6 +416,7 @@ resource "aws_launch_template" "bastion-privateweave-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -475,6 +476,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateweave-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -539,6 +541,7 @@ resource "aws_launch_template" "nodes-privateweave-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/public-jwks/kubernetes.tf b/tests/integration/update_cluster/public-jwks/kubernetes.tf index 8031a201a120b..e4de35c884af3 100644 --- a/tests/integration/update_cluster/public-jwks/kubernetes.tf +++ b/tests/integration/update_cluster/public-jwks/kubernetes.tf @@ -287,6 +287,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -351,6 +352,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/shared_subnet/kubernetes.tf b/tests/integration/update_cluster/shared_subnet/kubernetes.tf index a9493d0a981dc..6972f174662ae 100644 --- a/tests/integration/update_cluster/shared_subnet/kubernetes.tf +++ b/tests/integration/update_cluster/shared_subnet/kubernetes.tf @@ -246,6 +246,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedsubnet-example-c device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -310,6 +311,7 @@ resource "aws_launch_template" "nodes-sharedsubnet-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/shared_vpc/kubernetes.tf b/tests/integration/update_cluster/shared_vpc/kubernetes.tf index db64333e3c30a..86f99396a9ec9 100644 --- a/tests/integration/update_cluster/shared_vpc/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc/kubernetes.tf @@ -246,6 +246,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedvpc-example-com" device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -310,6 +311,7 @@ resource "aws_launch_template" "nodes-sharedvpc-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" } diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index 444b50c4f0a91..88ab6ef68f99b 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -393,6 +393,7 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 32 volume_type = "gp2" } @@ -452,6 +453,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-unmanaged-example-com" device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 64 volume_type = "gp2" } @@ -516,6 +518,7 @@ resource "aws_launch_template" "nodes-unmanaged-example-com" { device_name = "/dev/xvda" ebs { delete_on_termination = true + encrypted = false volume_size = 128 volume_type = "gp2" }