From ee5d8a34351b69fd1eb2bbcef3032bcff8a486d2 Mon Sep 17 00:00:00 2001 From: Bharath Vedartham Date: Mon, 7 Dec 2020 02:57:32 +0530 Subject: [PATCH] update integration tests --- .../bastionadditional_user-data/kubernetes.tf | 12 ++++++++++++ .../update_cluster/complex/cloudformation.json | 8 ++++++++ .../complex/in-legacy-v1alpha2.yaml | 3 +++ .../update_cluster/complex/in-v1alpha2.yaml | 3 +++ .../update_cluster/complex/kubernetes.tf | 8 ++++++++ .../update_cluster/compress/kubernetes.tf | 8 ++++++++ .../cloudformation.json | 8 ++++++++ .../update_cluster/existing_iam/kubernetes.tf | 16 ++++++++++++++++ .../cloudformation.json | 8 ++++++++ .../update_cluster/existing_sg/kubernetes.tf | 16 ++++++++++++++++ .../externallb/cloudformation.json | 8 ++++++++ .../update_cluster/externallb/kubernetes.tf | 8 ++++++++ .../externalpolicies/kubernetes.tf | 8 ++++++++ .../integration/update_cluster/ha/kubernetes.tf | 16 ++++++++++++++++ .../minimal-cloudformation/cloudformation.json | 8 ++++++++ .../minimal-json/kubernetes.tf.json | 8 ++++++++ .../update_cluster/minimal/kubernetes.tf | 8 ++++++++ .../mixed_instances/cloudformation.json | 16 ++++++++++++++++ .../update_cluster/mixed_instances/kubernetes.tf | 16 ++++++++++++++++ .../mixed_instances_spot/cloudformation.json | 16 ++++++++++++++++ .../mixed_instances_spot/kubernetes.tf | 16 ++++++++++++++++ .../private-shared-ip/cloudformation.json | 12 ++++++++++++ .../private-shared-ip/kubernetes.tf | 12 ++++++++++++ .../private-shared-subnet/kubernetes.tf | 12 ++++++++++++ .../privatecalico/cloudformation.json | 12 ++++++++++++ .../update_cluster/privatecalico/kubernetes.tf | 12 ++++++++++++ .../update_cluster/privatecanal/kubernetes.tf | 12 ++++++++++++ .../privatecilium/cloudformation.json | 12 ++++++++++++ .../update_cluster/privatecilium/kubernetes.tf | 12 ++++++++++++ .../privatecilium2/cloudformation.json | 12 ++++++++++++ .../update_cluster/privatecilium2/kubernetes.tf | 12 ++++++++++++ .../privateciliumadvanced/cloudformation.json | 12 ++++++++++++ .../privateciliumadvanced/kubernetes.tf | 12 ++++++++++++ .../update_cluster/privatedns1/kubernetes.tf | 12 ++++++++++++ .../update_cluster/privatedns2/kubernetes.tf | 12 ++++++++++++ .../update_cluster/privateflannel/kubernetes.tf | 12 ++++++++++++ .../update_cluster/privatekopeio/kubernetes.tf | 12 ++++++++++++ .../update_cluster/privateweave/kubernetes.tf | 12 ++++++++++++ .../update_cluster/public-jwks/kubernetes.tf | 8 ++++++++ .../update_cluster/shared_subnet/kubernetes.tf | 8 ++++++++ .../update_cluster/shared_vpc/kubernetes.tf | 8 ++++++++ .../update_cluster/unmanaged/kubernetes.tf | 12 ++++++++++++ 42 files changed, 458 insertions(+) diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index 14c886d586..94fa935eda 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.bastionuserdata.example.com" network_interfaces { associate_public_ip_address = true @@ -493,6 +497,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.bastionuserdata.example.com" network_interfaces { associate_public_ip_address = false @@ -553,6 +561,10 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.bastionuserdata.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/complex/cloudformation.json b/tests/integration/update_cluster/complex/cloudformation.json index fb81f31e88..2de252259b 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json +++ b/tests/integration/update_cluster/complex/cloudformation.json @@ -265,6 +265,10 @@ }, "ImageId": "ami-12345678", "InstanceType": "m3.medium", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "required" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -398,6 +402,10 @@ }, "ImageId": "ami-12345678", "InstanceType": "t2.medium", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "Monitoring": { "Enabled": true }, diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml index b629434bb0..a368627780 100644 --- a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml @@ -126,6 +126,9 @@ spec: rootVolumeEncryption: true subnets: - us-test-1a + instanceMetadata: + httpTokens: required + httpPutResponseHopLimit: 1 additionalUserData: - name: myscript.sh type: text/x-shellscript diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml index 6ed952c6a3..b451ca8591 100644 --- a/tests/integration/update_cluster/complex/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-v1alpha2.yaml @@ -126,6 +126,9 @@ spec: rootVolumeEncryption: true subnets: - us-test-1a + instanceMetadata: + httpTokens: required + httpPutResponseHopLimit: 1 additionalUserData: - name: myscript.sh type: text/x-shellscript diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index 8a89f92ba4..fc4505121c 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -297,6 +297,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "required" + } name = "master-us-test-1a.masters.complex.example.com" network_interfaces { associate_public_ip_address = true @@ -371,6 +375,10 @@ resource "aws_launch_template" "nodes-complex-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } monitoring { enabled = true } diff --git a/tests/integration/update_cluster/compress/kubernetes.tf b/tests/integration/update_cluster/compress/kubernetes.tf index 27c0e49e6e..ed0dbd37c6 100644 --- a/tests/integration/update_cluster/compress/kubernetes.tf +++ b/tests/integration/update_cluster/compress/kubernetes.tf @@ -266,6 +266,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-compress-example-com" lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.compress.example.com" network_interfaces { associate_public_ip_address = true @@ -325,6 +329,10 @@ resource "aws_launch_template" "nodes-compress-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.compress.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json index 29ebd4416b..740f1df56c 100644 --- a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json @@ -221,6 +221,10 @@ "ImageId": "ami-11400000", "InstanceType": "m3.medium", "KeyName": "kubernetes.containerd.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -328,6 +332,10 @@ "ImageId": "ami-11400000", "InstanceType": "t2.medium", "KeyName": "kubernetes.containerd.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index c1bd348d28..3a6d3e5ef3 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -387,6 +387,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-existing-iam-example-c lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.existing-iam.example.com" network_interfaces { associate_public_ip_address = true @@ -451,6 +455,10 @@ resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-c lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1b.masters.existing-iam.example.com" network_interfaces { associate_public_ip_address = true @@ -515,6 +523,10 @@ resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-c lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1c.masters.existing-iam.example.com" network_interfaces { associate_public_ip_address = true @@ -575,6 +587,10 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.existing-iam.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json index 6b477cc5a0..ce971d571f 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json @@ -219,6 +219,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.minimal.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -324,6 +328,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.minimal.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 025b222dc1..20479db13f 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -468,6 +468,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-existingsg-example-com lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.existingsg.example.com" network_interfaces { associate_public_ip_address = true @@ -532,6 +536,10 @@ resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1b.masters.existingsg.example.com" network_interfaces { associate_public_ip_address = true @@ -596,6 +604,10 @@ resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1c.masters.existingsg.example.com" network_interfaces { associate_public_ip_address = true @@ -656,6 +668,10 @@ resource "aws_launch_template" "nodes-existingsg-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.existingsg.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/externallb/cloudformation.json b/tests/integration/update_cluster/externallb/cloudformation.json index 4b8265a515..52e47a8ab8 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json +++ b/tests/integration/update_cluster/externallb/cloudformation.json @@ -236,6 +236,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.externallb.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -343,6 +347,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.externallb.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index a7d5317177..00ded097f1 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -281,6 +281,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-externallb-example-com lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.externallb.example.com" network_interfaces { associate_public_ip_address = true @@ -341,6 +345,10 @@ resource "aws_launch_template" "nodes-externallb-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.externallb.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/externalpolicies/kubernetes.tf b/tests/integration/update_cluster/externalpolicies/kubernetes.tf index c8b990846a..dcebe1b28d 100644 --- a/tests/integration/update_cluster/externalpolicies/kubernetes.tf +++ b/tests/integration/update_cluster/externalpolicies/kubernetes.tf @@ -345,6 +345,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-externalpolicies-examp lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.externalpolicies.example.com" network_interfaces { associate_public_ip_address = true @@ -411,6 +415,10 @@ resource "aws_launch_template" "nodes-externalpolicies-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } monitoring { enabled = true } diff --git a/tests/integration/update_cluster/ha/kubernetes.tf b/tests/integration/update_cluster/ha/kubernetes.tf index dfe29d079a..19f16b3206 100644 --- a/tests/integration/update_cluster/ha/kubernetes.tf +++ b/tests/integration/update_cluster/ha/kubernetes.tf @@ -439,6 +439,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-ha-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.ha.example.com" network_interfaces { associate_public_ip_address = true @@ -503,6 +507,10 @@ resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1b.masters.ha.example.com" network_interfaces { associate_public_ip_address = true @@ -567,6 +575,10 @@ resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1c.masters.ha.example.com" network_interfaces { associate_public_ip_address = true @@ -627,6 +639,10 @@ resource "aws_launch_template" "nodes-ha-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.ha.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json index 066fd9dd13..3fd89f8cda 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json @@ -221,6 +221,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.minimal.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -328,6 +332,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.minimal.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, diff --git a/tests/integration/update_cluster/minimal-json/kubernetes.tf.json b/tests/integration/update_cluster/minimal-json/kubernetes.tf.json index 6691f2c091..74bff3d697 100644 --- a/tests/integration/update_cluster/minimal-json/kubernetes.tf.json +++ b/tests/integration/update_cluster/minimal-json/kubernetes.tf.json @@ -322,6 +322,10 @@ "image_id": "ami-12345678", "instance_type": "m3.medium", "key_name": "${aws_key_pair.kubernetes-minimal-json-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}", + "metadata_options": { + "http_put_response_hop_limit": 1, + "http_tokens": "optional" + }, "network_interfaces": [ { "associate_public_ip_address": true, @@ -393,6 +397,10 @@ "image_id": "ami-12345678", "instance_type": "t2.medium", "key_name": "${aws_key_pair.kubernetes-minimal-json-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}", + "metadata_options": { + "http_put_response_hop_limit": 1, + "http_tokens": "optional" + }, "network_interfaces": [ { "associate_public_ip_address": true, diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index 58da12bcea..ad230074b2 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -277,6 +277,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.minimal.example.com" network_interfaces { associate_public_ip_address = true @@ -337,6 +341,10 @@ resource "aws_launch_template" "nodes-minimal-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.minimal.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json b/tests/integration/update_cluster/mixed_instances/cloudformation.json index 892a76fb24..09a4ee947b 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json @@ -392,6 +392,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -503,6 +507,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -614,6 +622,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -721,6 +733,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, diff --git a/tests/integration/update_cluster/mixed_instances/kubernetes.tf b/tests/integration/update_cluster/mixed_instances/kubernetes.tf index 2dd384a781..a0add99586 100644 --- a/tests/integration/update_cluster/mixed_instances/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances/kubernetes.tf @@ -457,6 +457,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true @@ -521,6 +525,10 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1b.masters.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true @@ -585,6 +593,10 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1c.masters.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true @@ -645,6 +657,10 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json index fb1c07ef2f..77f30c0b8f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json @@ -393,6 +393,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -504,6 +508,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -615,6 +623,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -722,6 +734,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.mixedinstances.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, diff --git a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf index e097def665..904308a11f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf @@ -457,6 +457,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true @@ -521,6 +525,10 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1b.masters.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true @@ -585,6 +593,10 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1c.masters.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true @@ -645,6 +657,10 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.mixedinstances.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json b/tests/integration/update_cluster/private-shared-ip/cloudformation.json index 4e525791a0..22e7d482df 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json @@ -261,6 +261,10 @@ "ImageId": "ami-11400000", "InstanceType": "t2.micro", "KeyName": "kubernetes.private-shared-ip.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -372,6 +376,10 @@ "ImageId": "ami-11400000", "InstanceType": "m3.medium", "KeyName": "kubernetes.private-shared-ip.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, @@ -479,6 +487,10 @@ "ImageId": "ami-11400000", "InstanceType": "t2.medium", "KeyName": "kubernetes.private-shared-ip.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf index f9ee5c481a..a8c8f89e86 100644 --- a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf @@ -406,6 +406,10 @@ resource "aws_launch_template" "bastion-private-shared-ip-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.private-shared-ip.example.com" network_interfaces { associate_public_ip_address = true @@ -469,6 +473,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-ip-exam lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.private-shared-ip.example.com" network_interfaces { associate_public_ip_address = false @@ -529,6 +537,10 @@ resource "aws_launch_template" "nodes-private-shared-ip-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.private-shared-ip.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index 7a2a32ae73..9fc8fa4c2d 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -401,6 +401,10 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.private-shared-subnet.example.com" network_interfaces { associate_public_ip_address = true @@ -464,6 +468,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet- lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.private-shared-subnet.example.com" network_interfaces { associate_public_ip_address = false @@ -524,6 +532,10 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.private-shared-subnet.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json b/tests/integration/update_cluster/privatecalico/cloudformation.json index 98f18806e4..fa9e1ea82d 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json @@ -323,6 +323,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.micro", "KeyName": "kubernetes.privatecalico.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -434,6 +438,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.privatecalico.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, @@ -541,6 +549,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.privatecalico.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index c1e2d3daf0..d8dcdb54e5 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatecalico.example.com" network_interfaces { associate_public_ip_address = true @@ -492,6 +496,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecalico-example- lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatecalico.example.com" network_interfaces { associate_public_ip_address = false @@ -552,6 +560,10 @@ resource "aws_launch_template" "nodes-privatecalico-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatecalico.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index b7b345939d..9caf5cf59b 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatecanal.example.com" network_interfaces { associate_public_ip_address = true @@ -492,6 +496,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecanal-example-c lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatecanal.example.com" network_interfaces { associate_public_ip_address = false @@ -552,6 +560,10 @@ resource "aws_launch_template" "nodes-privatecanal-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatecanal.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json b/tests/integration/update_cluster/privatecilium/cloudformation.json index 20b85a5244..e9dab7d0c8 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json @@ -323,6 +323,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.micro", "KeyName": "kubernetes.privatecilium.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -434,6 +438,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.privatecilium.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, @@ -541,6 +549,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.privatecilium.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index 0415c7e8b2..7993f4a2c5 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatecilium.example.com" network_interfaces { associate_public_ip_address = true @@ -492,6 +496,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example- lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatecilium.example.com" network_interfaces { associate_public_ip_address = false @@ -552,6 +560,10 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatecilium.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json b/tests/integration/update_cluster/privatecilium2/cloudformation.json index 20b85a5244..e9dab7d0c8 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json @@ -323,6 +323,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.micro", "KeyName": "kubernetes.privatecilium.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -434,6 +438,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.privatecilium.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, @@ -541,6 +549,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.privatecilium.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 0415c7e8b2..7993f4a2c5 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatecilium.example.com" network_interfaces { associate_public_ip_address = true @@ -492,6 +496,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example- lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatecilium.example.com" network_interfaces { associate_public_ip_address = false @@ -552,6 +560,10 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatecilium.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json index 600bd5c0c9..2305dd5d65 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json @@ -323,6 +323,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.micro", "KeyName": "kubernetes.privateciliumadvanced.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": true, @@ -434,6 +438,10 @@ "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.privateciliumadvanced.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, @@ -541,6 +549,10 @@ "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.privateciliumadvanced.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", + "MetadataOptions": { + "HttpPutResponseHopLimit": 1, + "HttpTokens": "optional" + }, "NetworkInterfaces": [ { "AssociatePublicIpAddress": false, diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index ce0520dd65..70a8e4f377 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -443,6 +443,10 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privateciliumadvanced.example.com" network_interfaces { associate_public_ip_address = true @@ -506,6 +510,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateciliumadvanced- lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privateciliumadvanced.example.com" network_interfaces { associate_public_ip_address = false @@ -566,6 +574,10 @@ resource "aws_launch_template" "nodes-privateciliumadvanced-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privateciliumadvanced.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 989e7111bc..e7c97c175b 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -473,6 +473,10 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatedns1.example.com" network_interfaces { associate_public_ip_address = true @@ -542,6 +546,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns1-example-co lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatedns1.example.com" network_interfaces { associate_public_ip_address = false @@ -608,6 +616,10 @@ resource "aws_launch_template" "nodes-privatedns1-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatedns1.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index 7707526a24..09269fa1f5 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -415,6 +415,10 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatedns2.example.com" network_interfaces { associate_public_ip_address = true @@ -478,6 +482,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns2-example-co lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatedns2.example.com" network_interfaces { associate_public_ip_address = false @@ -538,6 +546,10 @@ resource "aws_launch_template" "nodes-privatedns2-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatedns2.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index 5dfe1e07fa..0324a53ad3 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privateflannel.example.com" network_interfaces { associate_public_ip_address = true @@ -492,6 +496,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateflannel-example lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privateflannel.example.com" network_interfaces { associate_public_ip_address = false @@ -552,6 +560,10 @@ resource "aws_launch_template" "nodes-privateflannel-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privateflannel.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index ee05e60dc2..2cd7803b12 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -435,6 +435,10 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privatekopeio.example.com" network_interfaces { associate_public_ip_address = true @@ -498,6 +502,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatekopeio-example- lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privatekopeio.example.com" network_interfaces { associate_public_ip_address = false @@ -558,6 +566,10 @@ resource "aws_launch_template" "nodes-privatekopeio-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privatekopeio.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index f6ef2514fe..625ba64313 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -429,6 +429,10 @@ resource "aws_launch_template" "bastion-privateweave-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.privateweave.example.com" network_interfaces { associate_public_ip_address = true @@ -492,6 +496,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateweave-example-c lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.privateweave.example.com" network_interfaces { associate_public_ip_address = false @@ -552,6 +560,10 @@ resource "aws_launch_template" "nodes-privateweave-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.privateweave.example.com" network_interfaces { associate_public_ip_address = false diff --git a/tests/integration/update_cluster/public-jwks/kubernetes.tf b/tests/integration/update_cluster/public-jwks/kubernetes.tf index 8031a201a1..1c8e50c9d8 100644 --- a/tests/integration/update_cluster/public-jwks/kubernetes.tf +++ b/tests/integration/update_cluster/public-jwks/kubernetes.tf @@ -304,6 +304,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.minimal.example.com" network_interfaces { associate_public_ip_address = true @@ -364,6 +368,10 @@ resource "aws_launch_template" "nodes-minimal-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.minimal.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/shared_subnet/kubernetes.tf b/tests/integration/update_cluster/shared_subnet/kubernetes.tf index a9493d0a98..ce027f339c 100644 --- a/tests/integration/update_cluster/shared_subnet/kubernetes.tf +++ b/tests/integration/update_cluster/shared_subnet/kubernetes.tf @@ -263,6 +263,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedsubnet-example-c lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.sharedsubnet.example.com" network_interfaces { associate_public_ip_address = true @@ -323,6 +327,10 @@ resource "aws_launch_template" "nodes-sharedsubnet-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.sharedsubnet.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/shared_vpc/kubernetes.tf b/tests/integration/update_cluster/shared_vpc/kubernetes.tf index db64333e3c..a6d20f2c87 100644 --- a/tests/integration/update_cluster/shared_vpc/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc/kubernetes.tf @@ -263,6 +263,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedvpc-example-com" lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.sharedvpc.example.com" network_interfaces { associate_public_ip_address = true @@ -323,6 +327,10 @@ resource "aws_launch_template" "nodes-sharedvpc-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.sharedvpc.example.com" network_interfaces { associate_public_ip_address = true diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index 444b50c4f0..88d807676a 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -406,6 +406,10 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "bastion.unmanaged.example.com" network_interfaces { associate_public_ip_address = true @@ -469,6 +473,10 @@ resource "aws_launch_template" "master-us-test-1a-masters-unmanaged-example-com" lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "master-us-test-1a.masters.unmanaged.example.com" network_interfaces { associate_public_ip_address = false @@ -529,6 +537,10 @@ resource "aws_launch_template" "nodes-unmanaged-example-com" { lifecycle { create_before_destroy = true } + metadata_options { + http_put_response_hop_limit = 1 + http_tokens = "optional" + } name = "nodes.unmanaged.example.com" network_interfaces { associate_public_ip_address = false