File tree Expand file tree Collapse file tree
test_framework/terraform/aws Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ resource "aws_instance" "lh_aws_instance_controlplane" {
1212 instance_type = var. lh_aws_instance_type_controlplane
1313
1414 subnet_id = aws_subnet. lh_aws_public_subnet . id
15+ source_dest_check = var. cni == " default"
1516 vpc_security_group_ids = [
1617 aws_security_group . lh_aws_secgrp . id
1718 ]
@@ -48,6 +49,7 @@ resource "aws_instance" "lh_aws_instance_worker" {
4849 instance_type = var. lh_aws_instance_type_worker
4950
5051 subnet_id = aws_subnet. lh_aws_public_subnet . id
52+ source_dest_check = var. cni == " default"
5153 associate_public_ip_address = true
5254 vpc_security_group_ids = [
5355 aws_security_group . lh_aws_secgrp . id
Original file line number Diff line number Diff line change @@ -108,6 +108,17 @@ resource "aws_security_group" "lh_aws_secgrp" {
108108 protocol = " udp"
109109 cidr_blocks = [" 10.0.0.0/8" ]
110110 }
111+ dynamic "ingress" {
112+ for_each = var. cni == " calico" ? [1 ] : []
113+
114+ content {
115+ description = " Allow Calico IP-in-IP between cluster nodes"
116+ from_port = 0
117+ to_port = 0
118+ protocol = " 4"
119+ cidr_blocks = [aws_vpc . lh_aws_vpc . cidr_block ]
120+ }
121+ }
111122
112123 egress {
113124 from_port = 0
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ resource "aws_instance" "lh_aws_instance_controlplane" {
1212 instance_type = var. lh_aws_instance_type_controlplane
1313
1414 subnet_id = aws_subnet. lh_aws_public_subnet . id
15+ source_dest_check = var. cni == " default"
1516 vpc_security_group_ids = [
1617 aws_security_group . lh_aws_secgrp . id
1718 ]
@@ -48,6 +49,7 @@ resource "aws_instance" "lh_aws_instance_worker" {
4849 instance_type = var. lh_aws_instance_type_worker
4950
5051 subnet_id = aws_subnet. lh_aws_public_subnet . id
52+ source_dest_check = var. cni == " default"
5153 associate_public_ip_address = true
5254 vpc_security_group_ids = [
5355 aws_security_group . lh_aws_secgrp . id
Original file line number Diff line number Diff line change @@ -108,6 +108,17 @@ resource "aws_security_group" "lh_aws_secgrp" {
108108 protocol = " udp"
109109 cidr_blocks = [" 10.0.0.0/8" ]
110110 }
111+ dynamic "ingress" {
112+ for_each = var. cni == " calico" ? [1 ] : []
113+
114+ content {
115+ description = " Allow Calico IP-in-IP between cluster nodes"
116+ from_port = 0
117+ to_port = 0
118+ protocol = " 4"
119+ cidr_blocks = [aws_vpc . lh_aws_vpc . cidr_block ]
120+ }
121+ }
111122
112123 egress {
113124 from_port = 0
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ resource "aws_instance" "lh_aws_instance_controlplane" {
1212 instance_type = var. lh_aws_instance_type_controlplane
1313
1414 subnet_id = aws_subnet. lh_aws_public_subnet . id
15+ source_dest_check = var. cni == " default"
1516 vpc_security_group_ids = [
1617 aws_security_group . lh_aws_secgrp . id
1718 ]
@@ -48,6 +49,7 @@ resource "aws_instance" "lh_aws_instance_worker" {
4849 instance_type = var. lh_aws_instance_type_worker
4950
5051 subnet_id = aws_subnet. lh_aws_public_subnet . id
52+ source_dest_check = var. cni == " default"
5153 associate_public_ip_address = true
5254 vpc_security_group_ids = [
5355 aws_security_group . lh_aws_secgrp . id
Original file line number Diff line number Diff line change @@ -110,6 +110,18 @@ resource "aws_security_group" "lh_aws_secgrp" {
110110 cidr_blocks = [" 10.0.0.0/8" ]
111111 }
112112
113+ dynamic "ingress" {
114+ for_each = var. cni == " calico" ? [1 ] : []
115+
116+ content {
117+ description = " Allow Calico IP-in-IP between cluster nodes"
118+ from_port = 0
119+ to_port = 0
120+ protocol = " 4"
121+ cidr_blocks = [aws_vpc . lh_aws_vpc . cidr_block ]
122+ }
123+ }
124+
113125 egress {
114126 from_port = 0
115127 to_port = 0
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ resource "aws_instance" "lh_aws_instance_controlplane" {
1212 instance_type = var. lh_aws_instance_type_controlplane
1313
1414 subnet_id = aws_subnet. lh_aws_public_subnet . id
15+ source_dest_check = var. cni == " default"
1516 vpc_security_group_ids = [
1617 aws_security_group . lh_aws_secgrp_public . id
1718 ]
@@ -47,6 +48,7 @@ resource "aws_instance" "lh_aws_instance_worker" {
4748 associate_public_ip_address = true
4849
4950 subnet_id = aws_subnet. lh_aws_public_subnet . id
51+ source_dest_check = var. cni == " default"
5052 vpc_security_group_ids = [
5153 aws_security_group . lh_aws_secgrp_public . id
5254 ]
Original file line number Diff line number Diff line change @@ -109,6 +109,18 @@ resource "aws_security_group" "lh_aws_secgrp_public" {
109109 cidr_blocks = [" 10.0.0.0/8" ]
110110 }
111111
112+ dynamic "ingress" {
113+ for_each = var. cni == " calico" ? [1 ] : []
114+
115+ content {
116+ description = " Allow Calico IP-in-IP between cluster nodes"
117+ from_port = 0
118+ to_port = 0
119+ protocol = " 4"
120+ cidr_blocks = [aws_vpc . lh_aws_vpc . cidr_block ]
121+ }
122+ }
123+
112124 egress {
113125 from_port = 0
114126 to_port = 0
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ resource "aws_instance" "lh_aws_instance_controlplane" {
1212 instance_type = var. lh_aws_instance_type_controlplane
1313
1414 subnet_id = aws_subnet. lh_aws_public_subnet . id
15+ source_dest_check = var. cni == " default"
1516 vpc_security_group_ids = [
1617 aws_security_group . lh_aws_secgrp . id
1718 ]
@@ -49,6 +50,7 @@ resource "aws_instance" "lh_aws_instance_worker" {
4950 instance_type = var. lh_aws_instance_type_worker
5051
5152 subnet_id = aws_subnet. lh_aws_public_subnet . id
53+ source_dest_check = var. cni == " default"
5254 vpc_security_group_ids = [
5355 aws_security_group . lh_aws_secgrp . id
5456 ]
Original file line number Diff line number Diff line change @@ -216,6 +216,18 @@ resource "aws_security_group" "lh_aws_secgrp" {
216216 ipv6_cidr_blocks = [aws_vpc . lh_aws_vpc . ipv6_cidr_block ]
217217 }
218218
219+ dynamic "ingress" {
220+ for_each = var. cni == " calico" ? [1 ] : []
221+
222+ content {
223+ description = " Allow Calico IP-in-IP between cluster nodes"
224+ from_port = 0
225+ to_port = 0
226+ protocol = " 4"
227+ cidr_blocks = [aws_vpc . lh_aws_vpc . cidr_block ]
228+ }
229+ }
230+
219231 egress {
220232 from_port = 0
221233 to_port = 0
You can’t perform that action at this time.
0 commit comments