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

Use LaunchTemplate name instead of name_prefix for Terraform

This commit is contained in:
Ciprian Hacman 2020-11-03 11:41:12 +02:00
parent 565adceab9
commit 0c3e3784c8
28 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.bastionuserdata.example.com-"
name = "bastion.bastionuserdata.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -493,7 +493,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.bastionuserdata.example.com-"
name = "master-us-test-1a.masters.bastionuserdata.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -553,7 +553,7 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.bastionuserdata.example.com-"
name = "nodes.bastionuserdata.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -297,7 +297,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.complex.example.com-"
name = "master-us-test-1a.masters.complex.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -374,7 +374,7 @@ resource "aws_launch_template" "nodes-complex-example-com" {
monitoring {
enabled = true
}
name_prefix = "nodes.complex.example.com-"
name = "nodes.complex.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -387,7 +387,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existing-iam-example-c
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.existing-iam.example.com-"
name = "master-us-test-1a.masters.existing-iam.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -451,7 +451,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-c
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1b.masters.existing-iam.example.com-"
name = "master-us-test-1b.masters.existing-iam.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -515,7 +515,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-c
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1c.masters.existing-iam.example.com-"
name = "master-us-test-1c.masters.existing-iam.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -575,7 +575,7 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.existing-iam.example.com-"
name = "nodes.existing-iam.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -468,7 +468,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existingsg-example-com
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.existingsg.example.com-"
name = "master-us-test-1a.masters.existingsg.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -532,7 +532,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1b.masters.existingsg.example.com-"
name = "master-us-test-1b.masters.existingsg.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -596,7 +596,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1c.masters.existingsg.example.com-"
name = "master-us-test-1c.masters.existingsg.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -656,7 +656,7 @@ resource "aws_launch_template" "nodes-existingsg-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.existingsg.example.com-"
name = "nodes.existingsg.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -280,7 +280,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externallb-example-com
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.externallb.example.com-"
name = "master-us-test-1a.masters.externallb.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -340,7 +340,7 @@ resource "aws_launch_template" "nodes-externallb-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.externallb.example.com-"
name = "nodes.externallb.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -345,7 +345,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externalpolicies-examp
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.externalpolicies.example.com-"
name = "master-us-test-1a.masters.externalpolicies.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -414,7 +414,7 @@ resource "aws_launch_template" "nodes-externalpolicies-example-com" {
monitoring {
enabled = true
}
name_prefix = "nodes.externalpolicies.example.com-"
name = "nodes.externalpolicies.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -439,7 +439,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-ha-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.ha.example.com-"
name = "master-us-test-1a.masters.ha.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1b.masters.ha.example.com-"
name = "master-us-test-1b.masters.ha.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -567,7 +567,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1c.masters.ha.example.com-"
name = "master-us-test-1c.masters.ha.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -627,7 +627,7 @@ resource "aws_launch_template" "nodes-ha-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.ha.example.com-"
name = "nodes.ha.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -294,7 +294,7 @@
},
"aws_launch_template": {
"master-us-test-1a-masters-minimal-json-example-com": {
"name_prefix": "master-us-test-1a.masters.minimal-json.example.com-",
"name": "master-us-test-1a.masters.minimal-json.example.com",
"lifecycle": {
"create_before_destroy": true
},
@ -369,7 +369,7 @@
"user_data": "${file(\"${path.module}/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data\")}"
},
"nodes-minimal-json-example-com": {
"name_prefix": "nodes.minimal-json.example.com-",
"name": "nodes.minimal-json.example.com",
"lifecycle": {
"create_before_destroy": true
},

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

@ -277,7 +277,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.minimal.example.com-"
name = "master-us-test-1a.masters.minimal.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -337,7 +337,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.minimal.example.com-"
name = "nodes.minimal.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -457,7 +457,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.mixedinstances.example.com-"
name = "master-us-test-1a.masters.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -521,7 +521,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1b.masters.mixedinstances.example.com-"
name = "master-us-test-1b.masters.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -585,7 +585,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1c.masters.mixedinstances.example.com-"
name = "master-us-test-1c.masters.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -645,7 +645,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.mixedinstances.example.com-"
name = "nodes.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -457,7 +457,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.mixedinstances.example.com-"
name = "master-us-test-1a.masters.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -521,7 +521,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1b.masters.mixedinstances.example.com-"
name = "master-us-test-1b.masters.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -585,7 +585,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1c.masters.mixedinstances.example.com-"
name = "master-us-test-1c.masters.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -645,7 +645,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.mixedinstances.example.com-"
name = "nodes.mixedinstances.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -401,7 +401,7 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.private-shared-subnet.example.com-"
name = "bastion.private-shared-subnet.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -464,7 +464,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet-
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.private-shared-subnet.example.com-"
name = "master-us-test-1a.masters.private-shared-subnet.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -524,7 +524,7 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.private-shared-subnet.example.com-"
name = "nodes.private-shared-subnet.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatecalico.example.com-"
name = "bastion.privatecalico.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -492,7 +492,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecalico-example-
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatecalico.example.com-"
name = "master-us-test-1a.masters.privatecalico.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -552,7 +552,7 @@ resource "aws_launch_template" "nodes-privatecalico-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatecalico.example.com-"
name = "nodes.privatecalico.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatecanal.example.com-"
name = "bastion.privatecanal.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -492,7 +492,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecanal-example-c
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatecanal.example.com-"
name = "master-us-test-1a.masters.privatecanal.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -552,7 +552,7 @@ resource "aws_launch_template" "nodes-privatecanal-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatecanal.example.com-"
name = "nodes.privatecanal.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatecilium.example.com-"
name = "bastion.privatecilium.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -492,7 +492,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example-
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatecilium.example.com-"
name = "master-us-test-1a.masters.privatecilium.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -552,7 +552,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatecilium.example.com-"
name = "nodes.privatecilium.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatecilium.example.com-"
name = "bastion.privatecilium.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -492,7 +492,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecilium-example-
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatecilium.example.com-"
name = "master-us-test-1a.masters.privatecilium.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -552,7 +552,7 @@ resource "aws_launch_template" "nodes-privatecilium-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatecilium.example.com-"
name = "nodes.privatecilium.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -443,7 +443,7 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privateciliumadvanced.example.com-"
name = "bastion.privateciliumadvanced.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -506,7 +506,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateciliumadvanced-
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privateciliumadvanced.example.com-"
name = "master-us-test-1a.masters.privateciliumadvanced.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -566,7 +566,7 @@ resource "aws_launch_template" "nodes-privateciliumadvanced-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privateciliumadvanced.example.com-"
name = "nodes.privateciliumadvanced.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -473,7 +473,7 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatedns1.example.com-"
name = "bastion.privatedns1.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -542,7 +542,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns1-example-co
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatedns1.example.com-"
name = "master-us-test-1a.masters.privatedns1.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -608,7 +608,7 @@ resource "aws_launch_template" "nodes-privatedns1-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatedns1.example.com-"
name = "nodes.privatedns1.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -415,7 +415,7 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatedns2.example.com-"
name = "bastion.privatedns2.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -478,7 +478,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatedns2-example-co
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatedns2.example.com-"
name = "master-us-test-1a.masters.privatedns2.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -538,7 +538,7 @@ resource "aws_launch_template" "nodes-privatedns2-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatedns2.example.com-"
name = "nodes.privatedns2.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privateflannel.example.com-"
name = "bastion.privateflannel.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -492,7 +492,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateflannel-example
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privateflannel.example.com-"
name = "master-us-test-1a.masters.privateflannel.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -552,7 +552,7 @@ resource "aws_launch_template" "nodes-privateflannel-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privateflannel.example.com-"
name = "nodes.privateflannel.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -435,7 +435,7 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privatekopeio.example.com-"
name = "bastion.privatekopeio.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -498,7 +498,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatekopeio-example-
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privatekopeio.example.com-"
name = "master-us-test-1a.masters.privatekopeio.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -558,7 +558,7 @@ resource "aws_launch_template" "nodes-privatekopeio-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privatekopeio.example.com-"
name = "nodes.privatekopeio.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -429,7 +429,7 @@ resource "aws_launch_template" "bastion-privateweave-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.privateweave.example.com-"
name = "bastion.privateweave.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -492,7 +492,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privateweave-example-c
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.privateweave.example.com-"
name = "master-us-test-1a.masters.privateweave.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -552,7 +552,7 @@ resource "aws_launch_template" "nodes-privateweave-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.privateweave.example.com-"
name = "nodes.privateweave.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

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

@ -304,7 +304,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.minimal.example.com-"
name = "master-us-test-1a.masters.minimal.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -364,7 +364,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.minimal.example.com-"
name = "nodes.minimal.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -263,7 +263,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedsubnet-example-c
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.sharedsubnet.example.com-"
name = "master-us-test-1a.masters.sharedsubnet.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -323,7 +323,7 @@ resource "aws_launch_template" "nodes-sharedsubnet-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.sharedsubnet.example.com-"
name = "nodes.sharedsubnet.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -263,7 +263,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-sharedvpc-example-com"
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.sharedvpc.example.com-"
name = "master-us-test-1a.masters.sharedvpc.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -323,7 +323,7 @@ resource "aws_launch_template" "nodes-sharedvpc-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.sharedvpc.example.com-"
name = "nodes.sharedvpc.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true

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

@ -406,7 +406,7 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "bastion.unmanaged.example.com-"
name = "bastion.unmanaged.example.com"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -469,7 +469,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-unmanaged-example-com"
lifecycle {
create_before_destroy = true
}
name_prefix = "master-us-test-1a.masters.unmanaged.example.com-"
name = "master-us-test-1a.masters.unmanaged.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true
@ -529,7 +529,7 @@ resource "aws_launch_template" "nodes-unmanaged-example-com" {
lifecycle {
create_before_destroy = true
}
name_prefix = "nodes.unmanaged.example.com-"
name = "nodes.unmanaged.example.com"
network_interfaces {
associate_public_ip_address = false
delete_on_termination = true

6
upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go
View File

@ -109,8 +109,8 @@ type terraformLaunchTemplateTagSpecification struct {
}
type terraformLaunchTemplate struct {
// NamePrefix is the name of the launch template
NamePrefix *string `json:"name_prefix,omitempty" cty:"name_prefix"`
// Name is the name of the launch template
Name *string `json:"name,omitempty" cty:"name"`
// Lifecycle is the terraform lifecycle
Lifecycle *terraform.Lifecycle `json:"lifecycle,omitempty" cty:"lifecycle"`
@ -168,7 +168,7 @@ func (t *LaunchTemplate) RenderTerraform(target *terraform.TerraformTarget, a, e
}
tf := terraformLaunchTemplate{
NamePrefix: fi.String(fi.StringValue(e.Name) + "-"),
Name: e.Name,
EBSOptimized: e.RootVolumeOptimization,
ImageID: image,
InstanceType: e.InstanceType,

4
upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go
View File

@ -75,7 +75,7 @@ resource "aws_launch_template" "test" {
monitoring {
enabled = true
}
name_prefix = "test-"
name = "test"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
@ -154,7 +154,7 @@ resource "aws_launch_template" "test" {
monitoring {
enabled = true
}
name_prefix = "test-"
name = "test"
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true