diff --git a/README.md b/README.md index 5116629..73b47cb 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Change logs are auto-generated with commitizen. | Name | Source | Version | |------|--------|---------| -| [cluster\_domain\_cname](#module\_cluster\_domain\_cname) | git@github.e.it.census.gov:terraform-modules/aws-dns//cname | n/a | +| [cname\_cluster\_domain](#module\_cname\_cluster\_domain) | git@github.e.it.census.gov:terraform-modules/aws-dns//cname | n/a | ## Resources @@ -48,7 +48,6 @@ Change logs are auto-generated with commitizen. | [aws_lb.lb](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/lb) | data source | | [aws_vpc.dummy_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | | [aws_vpc.eks_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | -| [aws_vpc_dhcp_options.options](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc_dhcp_options) | data source | | [kubernetes_service.istio_ingressgateway](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/service) | data source | ## Inputs diff --git a/aws_data.tf b/aws_data.tf index dd53245..7bfda66 100644 --- a/aws_data.tf +++ b/aws_data.tf @@ -5,13 +5,6 @@ data "aws_vpc" "eks_vpc" { } } -data "aws_vpc_dhcp_options" "options" { - filter { - name = "vpc-id" - values = [local.vpc_id] - } -} - data "aws_caller_identity" "current" {} data "aws_arn" "current" { diff --git a/main.tf b/main.tf index 4e0c1ee..a0d2cc6 100644 --- a/main.tf +++ b/main.tf @@ -12,7 +12,6 @@ locals { is_shared_vpc = data.aws_vpc.eks_vpc.owner_id != data.aws_caller_identity.current.account_id region = var.region vpc_domain_name = var.vpc_domain_name - vpc_id = data.aws_vpc.eks_vpc.id } resource "time_static" "timestamp" {} @@ -112,11 +111,11 @@ resource "aws_route53_zone_association" "self_zone_west" { # zone_id = aws_route53_zone.cluster_domain.zone_id # } -module "cluster_domain_cname" { +module "cname_cluster_domain" { # tflint-ignore: terraform_module_pinned_source source = "git@github.e.it.census.gov:terraform-modules/aws-dns//cname" - name = format("%v.%v", var.cluster_name, data.aws_vpc_dhcp_options.options.domain_name) + name = format("%v.%v", var.cluster_name, local.cluster_domain_name) values = data.aws_lb.lb.dns_name zone = aws_route53_zone.cluster_domain.zone_id }