kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set default IMDS v2 to "required" for instances in AWS

This commit is contained in:
Ciprian Hacman 2021-01-21 10:02:10 +02:00
parent c8a9b2fb3e
commit d889d61ddb
48 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
k8s/crds/kops.k8s.io_instancegroups.yaml
View File

@ -239,7 +239,7 @@ spec:
httpTokens:
description: HTTPTokens is the state of token usage for the instance
metadata requests. If the parameter is not specified in the
request, the default state is "optional".
request, the default state is "required".
type: string
type: object
instanceProtection:

2
pkg/apis/kops/instancegroup.go
View File

@ -192,7 +192,7 @@ type InstanceMetadataOptions struct {
// The larger the number, the further instance metadata requests can travel. The default value is 1.
HTTPPutResponseHopLimit *int64 `json:"httpPutResponseHopLimit,omitempty"`
// HTTPTokens is the state of token usage for the instance metadata requests.
// If the parameter is not specified in the request, the default state is "optional".
// If the parameter is not specified in the request, the default state is "required".
HTTPTokens *string `json:"httpTokens,omitempty"`
}

2
pkg/apis/kops/v1alpha2/instancegroup.go
View File

@ -190,7 +190,7 @@ type InstanceMetadataOptions struct {
// The larger the number, the further instance metadata requests can travel. The default value is 1.
HTTPPutResponseHopLimit *int64 `json:"httpPutResponseHopLimit,omitempty"`
// HTTPTokens is the state of token usage for the instance metadata requests.
// If the parameter is not specified in the request, the default state is "optional".
// If the parameter is not specified in the request, the default state is "required".
HTTPTokens *string `json:"httpTokens,omitempty"`
}

2
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -238,7 +238,7 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchConfigurationTask(c *fi.ModelB
SecurityGroups: []*awstasks.SecurityGroup{sgLink},
}
t.HTTPTokens = fi.String("optional")
t.HTTPTokens = fi.String(ec2.LaunchTemplateHttpTokensStateRequired)
if ig.Spec.InstanceMetadata != nil && ig.Spec.InstanceMetadata.HTTPTokens != nil {
t.HTTPTokens = ig.Spec.InstanceMetadata.HTTPTokens
}

6
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.bastionuserdata.example.com"
network_interfaces {
@ -527,7 +527,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.bastionuserdata.example.com"
network_interfaces {
@ -598,7 +598,7 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.bastionuserdata.example.com"
network_interfaces {

2
tests/integration/update_cluster/complex/cloudformation.json
View File

@ -424,7 +424,7 @@
"InstanceType": "t2.medium",
"MetadataOptions": {
"HttpPutResponseHopLimit": 1,
"HttpTokens": "optional"
"HttpTokens": "required"
},
"Monitoring": {
"Enabled": true

2
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -408,7 +408,7 @@ resource "aws_launch_template" "nodes-complex-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
monitoring {
enabled = true

4
tests/integration/update_cluster/compress/kubernetes.tf
View File

@ -287,7 +287,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-compress-example-com"
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.compress.example.com"
network_interfaces {
@ -357,7 +357,7 @@ resource "aws_launch_template" "nodes-compress-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.compress.example.com"
network_interfaces {

4
tests/integration/update_cluster/containerd-custom/cloudformation.json
View File

@ -231,7 +231,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -353,7 +353,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

4
tests/integration/update_cluster/containerd/cloudformation.json
View File

@ -231,7 +231,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -353,7 +353,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

4
tests/integration/update_cluster/docker-custom/cloudformation.json
View File

@ -231,7 +231,7 @@
"KeyName": "kubernetes.docker.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57",
"MetadataOptions": {
"HttpPutResponseHopLimit": 1,
"HttpTokens": "optional"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -353,7 +353,7 @@
"KeyName": "kubernetes.docker.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57",
"MetadataOptions": {
"HttpPutResponseHopLimit": 1,
"HttpTokens": "optional"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

8
tests/integration/update_cluster/existing_iam/kubernetes.tf
View File

@ -408,7 +408,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existing-iam-example-c
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.existing-iam.example.com"
network_interfaces {
@ -483,7 +483,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-c
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1b.masters.existing-iam.example.com"
network_interfaces {
@ -558,7 +558,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-c
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1c.masters.existing-iam.example.com"
network_interfaces {
@ -629,7 +629,7 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.existing-iam.example.com"
network_interfaces {

4
tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json
View File

@ -229,7 +229,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -349,7 +349,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

8
tests/integration/update_cluster/existing_sg/kubernetes.tf
View File

@ -499,7 +499,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existingsg-example-com
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.existingsg.example.com"
network_interfaces {
@ -574,7 +574,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1b.masters.existingsg.example.com"
network_interfaces {
@ -649,7 +649,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1c.masters.existingsg.example.com"
network_interfaces {
@ -720,7 +720,7 @@ resource "aws_launch_template" "nodes-existingsg-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.existingsg.example.com"
network_interfaces {

4
tests/integration/update_cluster/externallb/cloudformation.json
View File

@ -246,7 +246,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -368,7 +368,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

4
tests/integration/update_cluster/externallb/kubernetes.tf
View File

@ -302,7 +302,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externallb-example-com
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.externallb.example.com"
network_interfaces {
@ -373,7 +373,7 @@ resource "aws_launch_template" "nodes-externallb-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.externallb.example.com"
network_interfaces {

4
tests/integration/update_cluster/externalpolicies/kubernetes.tf
View File

@ -370,7 +370,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externalpolicies-examp
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.externalpolicies.example.com"
network_interfaces {
@ -447,7 +447,7 @@ resource "aws_launch_template" "nodes-externalpolicies-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
monitoring {
enabled = true

8
tests/integration/update_cluster/ha/kubernetes.tf
View File

@ -470,7 +470,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-ha-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.ha.example.com"
network_interfaces {
@ -545,7 +545,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1b.masters.ha.example.com"
network_interfaces {
@ -620,7 +620,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1c.masters.ha.example.com"
network_interfaces {
@ -691,7 +691,7 @@ resource "aws_launch_template" "nodes-ha-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.ha.example.com"
network_interfaces {

4
tests/integration/update_cluster/minimal-cloudformation/cloudformation.json
View File

@ -231,7 +231,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -353,7 +353,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

4
tests/integration/update_cluster/minimal-gp3/cloudformation.json
View File

@ -227,7 +227,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -349,7 +349,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

4
tests/integration/update_cluster/minimal-gp3/kubernetes.tf
View File

@ -296,7 +296,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.minimal.example.com"
network_interfaces {
@ -367,7 +367,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.minimal.example.com"
network_interfaces {

4
tests/integration/update_cluster/minimal-json/kubernetes.tf.json
View File

@ -343,7 +343,7 @@
"metadata_options": {
"http_endpoint": "enabled",
"http_put_response_hop_limit": 1,
"http_tokens": "optional"
"http_tokens": "required"
},
"network_interfaces": [
{
@ -425,7 +425,7 @@
"metadata_options": {
"http_endpoint": "enabled",
"http_put_response_hop_limit": 1,
"http_tokens": "optional"
"http_tokens": "required"
},
"network_interfaces": [
{

4
tests/integration/update_cluster/minimal/kubernetes.tf
View File

@ -298,7 +298,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.minimal.example.com"
network_interfaces {
@ -369,7 +369,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.minimal.example.com"
network_interfaces {

8
tests/integration/update_cluster/mixed_instances/cloudformation.json
View File

@ -412,7 +412,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -538,7 +538,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -664,7 +664,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -786,7 +786,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

8
tests/integration/update_cluster/mixed_instances/kubernetes.tf
View File

@ -488,7 +488,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.mixedinstances.example.com"
network_interfaces {
@ -563,7 +563,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1b.masters.mixedinstances.example.com"
network_interfaces {
@ -638,7 +638,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1c.masters.mixedinstances.example.com"
network_interfaces {
@ -709,7 +709,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.mixedinstances.example.com"
network_interfaces {

8
tests/integration/update_cluster/mixed_instances_spot/cloudformation.json
View File

@ -413,7 +413,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -539,7 +539,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -665,7 +665,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -787,7 +787,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

8
tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf
View File

@ -488,7 +488,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.mixedinstances.example.com"
network_interfaces {
@ -563,7 +563,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1b.masters.mixedinstances.example.com"
network_interfaces {
@ -638,7 +638,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1c.masters.mixedinstances.example.com"
network_interfaces {
@ -709,7 +709,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.mixedinstances.example.com"
network_interfaces {

6
tests/integration/update_cluster/private-shared-ip/cloudformation.json
View File

@ -271,7 +271,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -389,7 +389,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -511,7 +511,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

6
tests/integration/update_cluster/private-shared-ip/kubernetes.tf
View File

@ -432,7 +432,7 @@ resource "aws_launch_template" "bastion-private-shared-ip-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.private-shared-ip.example.com"
network_interfaces {
@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-ip-exam
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.private-shared-ip.example.com"
network_interfaces {
@ -574,7 +574,7 @@ resource "aws_launch_template" "nodes-private-shared-ip-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.private-shared-ip.example.com"
network_interfaces {

6
tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
View File

@ -427,7 +427,7 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.private-shared-subnet.example.com"
network_interfaces {
@ -498,7 +498,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet-
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.private-shared-subnet.example.com"
network_interfaces {
@ -569,7 +569,7 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.private-shared-subnet.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatecalico/cloudformation.json
View File

@ -333,7 +333,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -451,7 +451,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -573,7 +573,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

6
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatecalico.example.com"
network_interfaces {
@ -526,7 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecalico-example-
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatecalico.example.com"
network_interfaces {
@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-privatecalico-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatecalico.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatecanal.example.com"
network_interfaces {
@ -526,7 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecanal-example-c
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatecanal.example.com"
network_interfaces {
@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-privatecanal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatecanal.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatecilium/cloudformation.json
View File

@ -333,7 +333,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -451,7 +451,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -573,7 +573,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

6
tests/integration/update_cluster/privatecilium/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatecilium.example.com"
network_interfaces {
@ -526,7 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example-
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatecilium.example.com"
network_interfaces {
@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatecilium.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatecilium2/cloudformation.json
View File

@ -333,7 +333,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -451,7 +451,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -573,7 +573,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

6
tests/integration/update_cluster/privatecilium2/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatecilium.example.com"
network_interfaces {
@ -526,7 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example-
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatecilium.example.com"
network_interfaces {
@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatecilium.example.com"
network_interfaces {

6
tests/integration/update_cluster/privateciliumadvanced/cloudformation.json
View File

@ -333,7 +333,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -451,7 +451,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{
@ -573,7 +573,7 @@
"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"
"HttpTokens": "required"
},
"NetworkInterfaces": [
{

6
tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf
View File

@ -469,7 +469,7 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privateciliumadvanced.example.com"
network_interfaces {
@ -540,7 +540,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateciliumadvanced-
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privateciliumadvanced.example.com"
network_interfaces {
@ -611,7 +611,7 @@ resource "aws_launch_template" "nodes-privateciliumadvanced-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privateciliumadvanced.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -505,7 +505,7 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatedns1.example.com"
network_interfaces {
@ -582,7 +582,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns1-example-co
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatedns1.example.com"
network_interfaces {
@ -659,7 +659,7 @@ resource "aws_launch_template" "nodes-privatedns1-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatedns1.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -441,7 +441,7 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatedns2.example.com"
network_interfaces {
@ -512,7 +512,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns2-example-co
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatedns2.example.com"
network_interfaces {
@ -583,7 +583,7 @@ resource "aws_launch_template" "nodes-privatedns2-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatedns2.example.com"
network_interfaces {

6
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privateflannel.example.com"
network_interfaces {
@ -526,7 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateflannel-example
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privateflannel.example.com"
network_interfaces {
@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-privateflannel-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privateflannel.example.com"
network_interfaces {

6
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -461,7 +461,7 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privatekopeio.example.com"
network_interfaces {
@ -532,7 +532,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatekopeio-example-
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privatekopeio.example.com"
network_interfaces {
@ -603,7 +603,7 @@ resource "aws_launch_template" "nodes-privatekopeio-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privatekopeio.example.com"
network_interfaces {

6
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -455,7 +455,7 @@ resource "aws_launch_template" "bastion-privateweave-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.privateweave.example.com"
network_interfaces {
@ -526,7 +526,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateweave-example-c
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.privateweave.example.com"
network_interfaces {
@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-privateweave-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.privateweave.example.com"
network_interfaces {

4
tests/integration/update_cluster/public-jwks/kubernetes.tf
View File

@ -330,7 +330,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.minimal.example.com"
network_interfaces {
@ -401,7 +401,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.minimal.example.com"
network_interfaces {

4
tests/integration/update_cluster/shared_subnet/kubernetes.tf
View File

@ -284,7 +284,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedsubnet-example-c
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.sharedsubnet.example.com"
network_interfaces {
@ -355,7 +355,7 @@ resource "aws_launch_template" "nodes-sharedsubnet-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.sharedsubnet.example.com"
network_interfaces {

4
tests/integration/update_cluster/shared_vpc/kubernetes.tf
View File

@ -284,7 +284,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedvpc-example-com"
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.sharedvpc.example.com"
network_interfaces {
@ -355,7 +355,7 @@ resource "aws_launch_template" "nodes-sharedvpc-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.sharedvpc.example.com"
network_interfaces {

6
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -432,7 +432,7 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "bastion.unmanaged.example.com"
network_interfaces {
@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-unmanaged-example-com"
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "master-us-test-1a.masters.unmanaged.example.com"
network_interfaces {
@ -574,7 +574,7 @@ resource "aws_launch_template" "nodes-unmanaged-example-com" {
metadata_options {
http_endpoint = "enabled"
http_put_response_hop_limit = 1
http_tokens = "optional"
http_tokens = "required"
}
name = "nodes.unmanaged.example.com"
network_interfaces {