diff --git a/copy_images.tf b/copy_images.tf index d5b94c1..ce18d9d 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -25,7 +25,7 @@ locals { } module "images" { - source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=2.0.2" + source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade" profile = var.profile application_name = var.cluster_name @@ -38,8 +38,12 @@ module "images" { ## destination_password = "" ## destination_username = "" ## override_prefixes = {} - region = var.region + ## region = var.region ## source_password = "" ## source_username = "" + + enable_lifecycle_policy = true + lifecycle_policy_all = true + force_delete = true } diff --git a/examples/simple/istio.tf b/examples/simple/istio.tf index e618207..2088645 100644 --- a/examples/simple/istio.tf +++ b/examples/simple/istio.tf @@ -1,5 +1,5 @@ module "eks-configuration" { - source = "git@github.it.census.gov:SOA/tfmod-istio.git//?ref=v1.0.1" + source = "../.." region = var.region profile = var.profile diff --git a/examples/simple/simple.auto.tfvars b/examples/simple/simple.auto.tfvars index 9f26d1d..d6bcabb 100644 --- a/examples/simple/simple.auto.tfvars +++ b/examples/simple/simple.auto.tfvars @@ -1,4 +1,4 @@ region = "us-gov-east-1" -profile = "107742151971-do2-govcloud" -cluster_name = "adsd-cumulus-sandbox" +profile = "terraform" +cluster_name = "platform-test-1" diff --git a/main.tf b/main.tf index f599126..eb0a9df 100644 --- a/main.tf +++ b/main.tf @@ -88,11 +88,11 @@ resource "helm_release" "istiod" { } set { name = "global.proxy.image" - value = module.images.images[local.proxy_key].dest_repository + value = module.images.images[local.proxy_key].dest_full_path } set { name = "global.proxy_init.image" - value = module.images.images[local.proxy_key].dest_repository + value = module.images.images[local.proxy_key].dest_full_path } set { @@ -126,11 +126,18 @@ resource "helm_release" "ingress" { name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-type" value = "nlb" } + set { - name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-additional-resource-tags" - value = join(",", [for key, value in local.tags : "${key}=${value}"]) + name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-internal" + type = "string" + value = "true" } + set { + name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-additional-resource-tags" + value = join("\\,", [for key, value in local.tags : "${key}=${value}"]) + } + dynamic "set" { for_each = local.ports @@ -163,6 +170,8 @@ resource "helm_release" "ingress" { value = set.value.port } } + + timeout = 90 } resource "helm_release" "egress" { @@ -180,5 +189,7 @@ resource "helm_release" "egress" { name = "service.type" value = "ClusterIP" } + + timeout = 90 } diff --git a/variables.tf b/variables.tf index 42ec972..d5c3cca 100644 --- a/variables.tf +++ b/variables.tf @@ -40,14 +40,14 @@ variable "tags" { variable "istio_chart_version" { description = "The version of istio to install into the cluster." type = string - default = "1.18.2" + default = "1.22.3" } # The `APP VERSION` of the output found while determining the chart version variable "istio_version" { description = "The version of istio to install into the cluster." type = string - default = "1.18.2" + default = "1.22.3" } variable "enable_telemetry" {