Skip to content

Commit

Permalink
Update integration test outputs with filebase64
Browse files Browse the repository at this point in the history
  • Loading branch information
rifelpet committed Jul 9, 2020
1 parent 1cf9838 commit f063d67
Show file tree
Hide file tree
Showing 24 changed files with 59 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" {
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_bastion.bastionuserdata.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_bastion.bastionuserdata.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-example-com" {
Expand Down Expand Up @@ -495,7 +495,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data")
}

resource "aws_launch_template" "nodes-bastionuserdata-example-com" {
Expand Down Expand Up @@ -549,7 +549,7 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data")
}

resource "aws_nat_gateway" "us-test-1a-bastionuserdata-example-com" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/complex/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" {
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data")
}

resource "aws_launch_template" "nodes-complex-example-com" {
Expand Down Expand Up @@ -413,7 +413,7 @@ resource "aws_launch_template" "nodes-complex-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.complex.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.complex.example.com_user_data")
}

resource "aws_route53_record" "api-complex-example-com" {
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/update_cluster/existing_iam/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existing-iam-example-c
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-com" {
Expand Down Expand Up @@ -433,7 +433,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-c
"kops.k8s.io/instancegroup" = "master-us-test-1b"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-com" {
Expand Down Expand Up @@ -491,7 +491,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-c
"kops.k8s.io/instancegroup" = "master-us-test-1c"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data")
}

resource "aws_launch_template" "nodes-existing-iam-example-com" {
Expand Down Expand Up @@ -545,7 +545,7 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.existing-iam.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.existing-iam.example.com_user_data")
}

resource "aws_route_table_association" "us-test-1a-existing-iam-example-com" {
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/update_cluster/existing_sg/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existingsg-example-com
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com" {
Expand Down Expand Up @@ -527,7 +527,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existingsg-example-com
"kops.k8s.io/instancegroup" = "master-us-test-1b"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com" {
Expand Down Expand Up @@ -585,7 +585,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existingsg-example-com
"kops.k8s.io/instancegroup" = "master-us-test-1c"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data")
}

resource "aws_launch_template" "nodes-existingsg-example-com" {
Expand Down Expand Up @@ -639,7 +639,7 @@ resource "aws_launch_template" "nodes-existingsg-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.existingsg.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.existingsg.example.com_user_data")
}

resource "aws_route53_record" "api-existingsg-example-com" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/externallb/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externallb-example-com
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/externallb.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data")
}

resource "aws_launch_template" "nodes-externallb-example-com" {
Expand Down Expand Up @@ -354,7 +354,7 @@ resource "aws_launch_template" "nodes-externallb-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/externallb.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.externallb.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.externallb.example.com_user_data")
}

resource "aws_route_table_association" "us-test-1a-externallb-example-com" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-externalpolicies-examp
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/externalpolicies.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data")
}

resource "aws_launch_template" "nodes-externalpolicies-example-com" {
Expand Down Expand Up @@ -422,7 +422,7 @@ resource "aws_launch_template" "nodes-externalpolicies-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/externalpolicies.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.externalpolicies.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.externalpolicies.example.com_user_data")
}

resource "aws_route53_record" "api-externalpolicies-example-com" {
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/update_cluster/ha/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-ha-example-com" {
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" {
Expand Down Expand Up @@ -485,7 +485,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-ha-example-com" {
"kops.k8s.io/instancegroup" = "master-us-test-1b"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" {
Expand Down Expand Up @@ -543,7 +543,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-ha-example-com" {
"kops.k8s.io/instancegroup" = "master-us-test-1c"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data")
}

resource "aws_launch_template" "nodes-ha-example-com" {
Expand Down Expand Up @@ -597,7 +597,7 @@ resource "aws_launch_template" "nodes-ha-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.ha.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.ha.example.com_user_data")
}

resource "aws_route_table_association" "us-test-1a-ha-example-com" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/minimal/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data")
}

resource "aws_launch_template" "nodes-minimal-example-com" {
Expand Down Expand Up @@ -339,7 +339,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.minimal.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.minimal.example.com_user_data")
}

resource "aws_route_table_association" "us-test-1a-minimal-example-com" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example-com" {
Expand Down Expand Up @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example
"kops.k8s.io/instancegroup" = "master-us-test-1b"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example-com" {
Expand Down Expand Up @@ -561,7 +561,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example
"kops.k8s.io/instancegroup" = "master-us-test-1c"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data")
}

resource "aws_launch_template" "nodes-mixedinstances-example-com" {
Expand Down Expand Up @@ -615,7 +615,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.mixedinstances.example.com_user_data")
}

resource "aws_route_table_association" "us-test-1a-mixedinstances-example-com" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-mixedinstances-example
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example-com" {
Expand Down Expand Up @@ -503,7 +503,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-mixedinstances-example
"kops.k8s.io/instancegroup" = "master-us-test-1b"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data")
}

resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example-com" {
Expand Down Expand Up @@ -561,7 +561,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-mixedinstances-example
"kops.k8s.io/instancegroup" = "master-us-test-1c"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data")
}

resource "aws_launch_template" "nodes-mixedinstances-example-com" {
Expand Down Expand Up @@ -615,7 +615,7 @@ resource "aws_launch_template" "nodes-mixedinstances-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.mixedinstances.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.mixedinstances.example.com_user_data")
}

resource "aws_route_table_association" "us-test-1a-mixedinstances-example-com" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet-
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data")
}

resource "aws_launch_template" "nodes-private-shared-subnet-example-com" {
Expand Down Expand Up @@ -520,7 +520,7 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data")
}

resource "aws_route53_record" "api-private-shared-subnet-example-com" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/privatecalico/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecalico-example-
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data")
}

resource "aws_launch_template" "nodes-privatecalico-example-com" {
Expand Down Expand Up @@ -548,7 +548,7 @@ resource "aws_launch_template" "nodes-privatecalico-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.privatecalico.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.privatecalico.example.com_user_data")
}

resource "aws_nat_gateway" "us-test-1a-privatecalico-example-com" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/privatecanal/kubernetes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatecanal-example-c
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data")
}

resource "aws_launch_template" "nodes-privatecanal-example-com" {
Expand Down Expand Up @@ -548,7 +548,7 @@ resource "aws_launch_template" "nodes-privatecanal-example-com" {
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
user_data = file("${path.module}/data/aws_launch_template_nodes.privatecanal.example.com_user_data")
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.privatecanal.example.com_user_data")
}

resource "aws_nat_gateway" "us-test-1a-privatecanal-example-com" {
Expand Down
Loading

0 comments on commit f063d67

Please sign in to comment.