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

Correct integration test to reflect SG restriction

This commit is contained in:
Steven E. Harris 2021-01-03 11:24:40 -05:00
parent 2a89d25ed0
commit 76feb2e637
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,8 +279,8 @@
{
"Ref": "AWSEC2SecurityGroupmasterscomplexexamplecom"
},
"sg-exampleid3",
"sg-exampleid4"
"sg-exampleid5",
"sg-exampleid6"
]
}
],
@ -422,8 +422,6 @@
"Ref": "AWSEC2SecurityGroupnodescomplexexamplecom"
},
"sg-exampleid3",
"sg-exampleid3",
"sg-exampleid4",
"sg-exampleid4"
]
}

4
tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml
View File

@ -8,8 +8,8 @@ spec:
loadBalancer:
type: Public
additionalSecurityGroups:
- sg-exampleid3
- sg-exampleid4
- sg-exampleid5
- sg-exampleid6
crossZoneLoadBalancing: true
class: Network
sslCertificate: arn:aws:acm:us-test-1:000000000000:certificate/123456789012-1234-1234-1234-12345678

4
tests/integration/update_cluster/complex/in-v1alpha2.yaml
View File

@ -8,8 +8,8 @@ spec:
loadBalancer:
type: Public
additionalSecurityGroups:
- sg-exampleid3
- sg-exampleid4
- sg-exampleid5
- sg-exampleid6
crossZoneLoadBalancing: true
class: Network
sslCertificate: arn:aws:acm:us-test-1:000000000000:certificate/123456789012-1234-1234-1234-12345678

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

@ -1,11 +1,11 @@
locals {
cluster_name = "complex.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-complex-example-com.id]
master_security_group_ids = [aws_security_group.masters-complex-example-com.id, "sg-exampleid3", "sg-exampleid4"]
master_security_group_ids = [aws_security_group.masters-complex-example-com.id, "sg-exampleid5", "sg-exampleid6"]
masters_role_arn = aws_iam_role.masters-complex-example-com.arn
masters_role_name = aws_iam_role.masters-complex-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-complex-example-com.id]
node_security_group_ids = [aws_security_group.nodes-complex-example-com.id, "sg-exampleid3", "sg-exampleid3", "sg-exampleid4", "sg-exampleid4"]
node_security_group_ids = [aws_security_group.nodes-complex-example-com.id, "sg-exampleid3", "sg-exampleid4"]
node_subnet_ids = [aws_subnet.us-test-1a-complex-example-com.id]
nodes_role_arn = aws_iam_role.nodes-complex-example-com.arn
nodes_role_name = aws_iam_role.nodes-complex-example-com.name
@ -25,7 +25,7 @@ output "master_autoscaling_group_ids" {
}
output "master_security_group_ids" {
value = [aws_security_group.masters-complex-example-com.id, "sg-exampleid3", "sg-exampleid4"]
value = [aws_security_group.masters-complex-example-com.id, "sg-exampleid5", "sg-exampleid6"]
}
output "masters_role_arn" {
@ -41,7 +41,7 @@ output "node_autoscaling_group_ids" {
}
output "node_security_group_ids" {
value = [aws_security_group.nodes-complex-example-com.id, "sg-exampleid3", "sg-exampleid3", "sg-exampleid4", "sg-exampleid4"]
value = [aws_security_group.nodes-complex-example-com.id, "sg-exampleid3", "sg-exampleid4"]
}
output "node_subnet_ids" {
@ -321,7 +321,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" {
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
security_groups = [aws_security_group.masters-complex-example-com.id, "sg-exampleid3", "sg-exampleid4"]
security_groups = [aws_security_group.masters-complex-example-com.id, "sg-exampleid5", "sg-exampleid6"]
}
tag_specifications {
resource_type = "instance"
@ -405,7 +405,7 @@ resource "aws_launch_template" "nodes-complex-example-com" {
network_interfaces {
associate_public_ip_address = true
delete_on_termination = true
security_groups = [aws_security_group.nodes-complex-example-com.id, "sg-exampleid3", "sg-exampleid3", "sg-exampleid4", "sg-exampleid4"]
security_groups = [aws_security_group.nodes-complex-example-com.id, "sg-exampleid3", "sg-exampleid4"]
}
tag_specifications {
resource_type = "instance"