Create IPv6 and dual stack enos tests (#5212)
Co-authored-by: Danielle Miu <29378233+DanielleMiu@users.noreply.github.com> Co-authored-by: Damian Debkowski <damian.debkowski@hashicorp.com>
This commit is contained in:
59 files changed
+1773
-301
No files matched your search
@@ -56,10 +56,13 @@ resource "random_integer" "az" {
|
||||
|
||||
# Create a subnet so that the worker doesn't share one with a controller
|
||||
resource "aws_subnet" "default" {
|
||||
vpc_id = var.vpc_id
|
||||
cidr_block = "10.13.9.0/24"
|
||||
map_public_ip_on_launch = true
|
||||
availability_zone = local.selected_az
|
||||
vpc_id = var.vpc_id
|
||||
cidr_block = "10.13.9.0/24"
|
||||
ipv6_cidr_block = var.ip_version != "4" ? cidrsubnet(var.vpc_cidr_ipv6, 8, 0) : null
|
||||
|
||||
map_public_ip_on_launch = true
|
||||
assign_ipv6_address_on_creation = var.ip_version != "4"
|
||||
availability_zone = local.selected_az
|
||||
tags = merge(
|
||||
local.common_tags,
|
||||
{
|
||||
@@ -79,22 +82,28 @@ resource "aws_security_group" "default" {
|
||||
from_port = 22
|
||||
to_port = 22
|
||||
protocol = "tcp"
|
||||
cidr_blocks = flatten([formatlist("%s/32", data.enos_environment.current.public_ipv4_addresses)])
|
||||
cidr_blocks = var.ip_version == "6" ? [] : flatten([
|
||||
# allow ingress from ipv4 to allow for test setup from ci
|
||||
formatlist("%s/32", data.enos_environment.current.public_ipv4_addresses)
|
||||
])
|
||||
ipv6_cidr_blocks = var.ip_version == "4" ? [] : (data.enos_environment.current.public_ipv6_addresses != null ? [for ip in data.enos_environment.current.public_ipv6_addresses : cidrsubnet("${ip}/64", 0, 0)] : [])
|
||||
}
|
||||
|
||||
ingress {
|
||||
description = "Communication from Boundary controller to worker"
|
||||
from_port = 9202
|
||||
to_port = 9202
|
||||
protocol = "tcp"
|
||||
cidr_blocks = ["0.0.0.0/0"]
|
||||
description = "Communication from Boundary controller to worker"
|
||||
from_port = 9202
|
||||
to_port = 9202
|
||||
protocol = "tcp"
|
||||
cidr_blocks = var.ip_version == "6" ? [] : ["0.0.0.0/0"]
|
||||
ipv6_cidr_blocks = var.ip_version == "4" ? [] : ["::/0"]
|
||||
}
|
||||
|
||||
egress {
|
||||
from_port = 0
|
||||
to_port = 0
|
||||
protocol = "-1"
|
||||
cidr_blocks = ["0.0.0.0/0"]
|
||||
from_port = 0
|
||||
to_port = 0
|
||||
protocol = "-1"
|
||||
cidr_blocks = var.ip_version == "6" ? [] : ["0.0.0.0/0"]
|
||||
ipv6_cidr_blocks = var.ip_version == "4" ? [] : ["::/0"]
|
||||
}
|
||||
|
||||
tags = merge(
|
||||
@@ -110,7 +119,8 @@ resource "aws_security_group" "default" {
|
||||
resource "aws_vpc_security_group_ingress_rule" "worker_to_controller" {
|
||||
description = "This rule allows traffic from a worker to controllers over WAN"
|
||||
security_group_id = var.controller_sg_id
|
||||
cidr_ipv4 = "${aws_instance.worker.public_ip}/32"
|
||||
cidr_ipv4 = var.ip_version == "4" ? "${aws_instance.worker.public_ip}/32" : null
|
||||
cidr_ipv6 = var.ip_version == "4" ? null : cidrsubnet("${aws_instance.worker.ipv6_addresses[0]}/64", 0, 0)
|
||||
from_port = 9201
|
||||
to_port = 9201
|
||||
ip_protocol = "tcp"
|
||||
@@ -134,6 +144,8 @@ resource "aws_instance" "worker" {
|
||||
iam_instance_profile = aws_iam_instance_profile.boundary_profile.name
|
||||
monitoring = var.worker_monitoring
|
||||
|
||||
ipv6_address_count = var.ip_version == "4" ? 0 : 1
|
||||
|
||||
root_block_device {
|
||||
iops = var.ebs_iops
|
||||
volume_size = var.ebs_size
|
||||
@@ -160,7 +172,7 @@ resource "enos_bundle_install" "worker" {
|
||||
|
||||
transport = {
|
||||
ssh = {
|
||||
host = aws_instance.worker.public_ip
|
||||
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -176,7 +188,7 @@ resource "enos_remote_exec" "update_path_worker" {
|
||||
|
||||
transport = {
|
||||
ssh = {
|
||||
host = aws_instance.worker.public_ip
|
||||
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -193,17 +205,20 @@ resource "enos_file" "worker_config" {
|
||||
content = templatefile("${path.module}/${var.config_file_path}", {
|
||||
id = random_pet.worker.id
|
||||
kms_key_id = data.aws_kms_key.kms_key.id
|
||||
public_addr = aws_instance.worker.public_ip
|
||||
controller_ips = var.ip_version == "4" ? jsonencode(var.controller_addresses) : jsonencode(formatlist("[%s]:9201", var.controller_addresses))
|
||||
listener_address = var.ip_version == "4" ? "0.0.0.0" : "[::]"
|
||||
public_address = var.ip_version == "6" ? format("[%s]", aws_instance.worker.ipv6_addresses[0]) : aws_instance.worker.public_ip
|
||||
type = jsonencode(var.worker_type_tags)
|
||||
region = data.aws_availability_zone.worker_az.region
|
||||
controller_addresses = jsonencode(var.controller_addresses)
|
||||
recording_storage_path = var.recording_storage_path
|
||||
audit_log_dir = local.audit_log_directory
|
||||
vault_address = var.ip_version == "4" ? var.vault_address : try(format("[%s]", var.vault_address), "")
|
||||
vault_transit_token = var.vault_transit_token
|
||||
})
|
||||
|
||||
transport = {
|
||||
ssh = {
|
||||
host = aws_instance.worker.public_ip
|
||||
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -219,7 +234,7 @@ resource "enos_boundary_start" "worker_start" {
|
||||
recording_storage_path = var.recording_storage_path != "" ? var.recording_storage_path : null
|
||||
transport = {
|
||||
ssh = {
|
||||
host = aws_instance.worker.public_ip
|
||||
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -238,7 +253,7 @@ resource "enos_remote_exec" "create_worker_audit_log_dir" {
|
||||
|
||||
transport = {
|
||||
ssh = {
|
||||
host = aws_instance.worker.public_ip
|
||||
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user