diff --git a/README.md b/README.md index d922c5a..9521572 100644 --- a/README.md +++ b/README.md @@ -19,19 +19,23 @@ Change logs are auto-generated with commitizen. | Name | Version | |------|---------| | [aws](#provider\_aws) | 5.68.0 | +| [aws.route53\_main\_east](#provider\_aws.route53\_main\_east) | 5.68.0 | +| [aws.route53\_main\_west](#provider\_aws.route53\_main\_west) | 5.68.0 | +| [aws.self](#provider\_aws.self) | 5.68.0 | ## Modules -| Name | Source | Version | -|------|--------|---------| -| [route53\_cluster\_domain\_east](#module\_route53\_cluster\_domain\_east) | git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone | tf-upgrade | -| [route53\_cluster\_domain\_west](#module\_route53\_cluster\_domain\_west) | git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone | tf-upgrade | +No modules. ## Resources | Name | Type | |------|------| +| [aws_route53_vpc_association_authorization.self_zone_east](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_vpc_association_authorization) | resource | +| [aws_route53_vpc_association_authorization.self_zone_west](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_vpc_association_authorization) | resource | | [aws_route53_zone.cluster_domain](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_zone) | resource | +| [aws_route53_zone_association.self_zone_east](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_zone_association) | resource | +| [aws_route53_zone_association.self_zone_west](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_zone_association) | resource | | [aws_arn.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source | | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_vpc.dummy_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | @@ -49,7 +53,6 @@ Change logs are auto-generated with commitizen. | [tags](#input\_tags) | AWS Tags to apply to appropriate resources | `map(string)` | `{}` | no | | [vpc\_domain\_name](#input\_vpc\_domain\_name) | The DNS domain name of the vpc the cluster is in. | `string` | n/a | yes | | [vpc\_name](#input\_vpc\_name) | Define the VPC name that will be used by this cluster | `string` | n/a | yes | -| [zone\_ids](#input\_zone\_ids) | zone ids to mock module call | `list(string)` |
[| no | ## Outputs diff --git a/main.tf b/main.tf index 1ab1f06..2bbcd83 100644 --- a/main.tf +++ b/main.tf @@ -12,7 +12,6 @@ locals { region = var.region is_shared_vpc = data.aws_vpc.eks_vpc.owner_id != data.aws_caller_identity.current.account_id vpc_domain_name = var.vpc_domain_name - zone_ids = concat(var.zone_ids, aws_route53_zone.cluster_domain.id) } #------------------------------------------------- @@ -47,37 +46,47 @@ resource "aws_route53_zone" "cluster_domain" { # cluster domain associations with central networking account # east region #--- -module "route53_cluster_domain_east" { +resource "aws_route53_vpc_association_authorization" "self_zone_east" { + depends_on = [aws_route53_zone.cluster_domain] + count = local.region == "us-gov-east-1" && local.is_shared_vpc ? 1 : 0 - count = local.region == "us-gov-east-1" && local.is_shared_vpc ? 1 : 0 - providers = { - aws.self = aws.self - aws.peer = aws.route53_main_east - } + provider = aws.self + zone_id = aws_route53_zone.cluster_domain.zone_id + vpc_region = "us-gov-east-1" + vpc_id = data.aws_vpc.eks_vpc.id +} + +resource "aws_route53_zone_association" "self_zone_east" { + provider = aws.route53_main_east + count = local.region == "us-gov-west-1" && local.is_shared_vpc ? 1 : 0 - source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade" - region = "us-gov-east-1" - vpc_id = data.aws_vpc.eks_vpc.id - zone_ids = [local.zone_ids] + zone_id = aws_route53_zone.cluster_domain.zone_id + vpc_id = data.aws_vpc.eks_vpc.id + vpc_region = "us-gov-east-1" - tags = var.tags + depends_on = [aws_route53_vpc_association_authorization.self_zone_east] } #------------------------------------------------- # west region #------------------------------------------------- -module "route53_cluster_domain_west" { +resource "aws_route53_vpc_association_authorization" "self_zone_west" { + depends_on = [aws_route53_zone.cluster_domain] + count = local.region == "us-gov-west-1" && local.is_shared_vpc ? 1 : 0 - count = local.region == "us-gov-west-1" && local.is_shared_vpc ? 1 : 0 - providers = { - aws.self = aws.self - aws.peer = aws.route53_main_west - } + provider = aws.self + zone_id = aws_route53_zone.cluster_domain.zone_id + vpc_region = "us-gov-west-1" + vpc_id = data.aws_vpc.eks_vpc.id +} + +resource "aws_route53_zone_association" "self_zone_west" { + provider = aws.route53_main_west + count = local.region == "us-gov-west-1" && local.is_shared_vpc ? 1 : 0 - source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade" - region = "us-gov-west-1" - vpc_id = data.aws_vpc.eks_vpc.id - zone_ids = [local.zone_ids] + zone_id = aws_route53_zone.cluster_domain.zone_id + vpc_id = data.aws_vpc.eks_vpc.id + vpc_region = "us-gov-west-1" - tags = var.tags + depends_on = [aws_route53_vpc_association_authorization.self_zone_west] } diff --git a/variables.tf b/variables.tf index eb0613f..2336ee9 100644 --- a/variables.tf +++ b/variables.tf @@ -65,9 +65,3 @@ variable "route53_endpoints" { } } } - -variable "zone_ids" { - description = "zone ids to mock module call" - type = list(string) - default = [""] -}
""
]