Merge branch 'upgrade' into mcmCluster

SCT-Engineering · Jul 27, 2024 · 0716fb4 · 0716fb4
2 parents 5d18718 + c4bd940
commit 0716fb4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/copy_images.tf b/copy_images.tf
@@ -38,7 +38,7 @@ module "images" {
   ##  destination_password = ""
   ##  destination_username = ""
   ##  override_prefixes    = {}
-  region = var.region
+  ##  region = var.region
   ##  source_password      = ""
   ##  source_username      = ""
 

diff --git 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
@@ -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
@@ -89,11 +89,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 {
@@ -127,11 +127,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
 
@@ -164,6 +171,8 @@ resource "helm_release" "ingress" {
       value = set.value.port
     }
   }
+
+  timeout = 90
 }
 
 resource "helm_release" "egress" {
@@ -181,4 +190,6 @@ resource "helm_release" "egress" {
     name  = "service.type"
     value = "ClusterIP"
   }
+
+  timeout = 90
 }
diff --git 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" {