Update expected outputs of integration tests

kubernetes · Dec 4, 2020 · fc2b5c9 · fc2b5c9
1 parent 9a15047
commit fc2b5c9
Show file tree

Hide file tree

Showing 39 changed files with 146 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
               }
             }
           ],