From 7e02f7d55e1589a206eb50c53ec007980a86dd0f Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 16 Oct 2024 15:09:25 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fix(cname):=20module=20use?= =?UTF-8?q?=20fixed=20using=20correct=20name=20instead=20of=20zone=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 +++++------------ main.tf | 9 +++++---- requirements.tf | 8 -------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 73b47cb..c4aead1 100644 --- a/README.md +++ b/README.md @@ -13,19 +13,15 @@ Change logs are auto-generated with commitizen. |------|---------| | [terraform](#requirement\_terraform) | >= 1.5 | | [aws](#requirement\_aws) | >= 5.14.0 | -| [kubernetes](#requirement\_kubernetes) | >= 2.23.0 | -| [time](#requirement\_time) | >= 0.9 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.70.0 | -| [aws.route53\_main\_east](#provider\_aws.route53\_main\_east) | 5.70.0 | -| [aws.route53\_main\_west](#provider\_aws.route53\_main\_west) | 5.70.0 | -| [aws.self](#provider\_aws.self) | 5.70.0 | -| [kubernetes](#provider\_kubernetes) | 2.32.0 | -| [time](#provider\_time) | 0.12.1 | +| [aws](#provider\_aws) | 5.72.0 | +| [aws.route53\_main\_east](#provider\_aws.route53\_main\_east) | 5.72.0 | +| [aws.route53\_main\_west](#provider\_aws.route53\_main\_west) | 5.72.0 | +| [aws.self](#provider\_aws.self) | 5.72.0 | ## Modules @@ -42,20 +38,17 @@ Change logs are auto-generated with commitizen. | [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 | -| [time_static.timestamp](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/static) | 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_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 | -| [kubernetes_service.istio_ingressgateway](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/service) | data source | ## Inputs | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes | -| [istio\_namespace](#input\_istio\_namespace) | The namespace to install the istio components. Defaults to 'istio-system' | `string` | `"istio-system"` | no | +| [istio\_ingress\_lb](#input\_istio\_ingress\_lb) | The istio ingress load balancer DNS. | `string` | n/a | yes | | [os\_username](#input\_os\_username) | OS username from environment variable, ideally as $USER | `string` | `null` | no | | [region](#input\_region) | AWS config region | `string` | `""` | no | | [region\_map](#input\_region\_map) | AWS region map | `map(string)` | 
{
  "east": "us-gov-east-1",
  "west": "us-gov-west-1"
}
| no | diff --git a/main.tf b/main.tf index 3c5a378..b6df98a 100644 --- a/main.tf +++ b/main.tf @@ -14,7 +14,7 @@ locals { vpc_domain_name = var.vpc_domain_name } -resource "time_static" "timestamp" {} +# resource "time_static" "timestamp" {} #------------------------------------------------- # cluster_domain dns zone @@ -99,7 +99,8 @@ 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", "*", local.cluster_domain_name) - values = var.istio_ingress_lb - zone = aws_route53_zone.cluster_domain.zone_id + name = format("*.%v", local.cluster_domain_name) + values = [var.istio_ingress_lb] + zone = aws_route53_zone.cluster_domain.name + enable_heritage = false } diff --git a/requirements.tf b/requirements.tf index 2ce3460..94a08f3 100644 --- a/requirements.tf +++ b/requirements.tf @@ -6,13 +6,5 @@ terraform { source = "hashicorp/aws" version = ">= 5.14.0" } - kubernetes = { - source = "hashicorp/kubernetes" - version = ">= 2.23.0" - } - time = { - source = "hashicorp/time" - version = ">= 0.9" - } } } From c310b640ea1955940e4b2c45503cf85650cb1cae Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 16 Oct 2024 15:13:18 -0400 Subject: [PATCH 2/2] remove time and timestamp resource: --- main.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.tf b/main.tf index b6df98a..28076cb 100644 --- a/main.tf +++ b/main.tf @@ -14,8 +14,6 @@ locals { vpc_domain_name = var.vpc_domain_name } -# resource "time_static" "timestamp" {} - #------------------------------------------------- # cluster_domain dns zone #-------------------------------------------------