Merge pull request #1 from SCT-Engineering/mcmCluster

updates from karpenter

README.md

@@ -21,6 +21,17 @@ have a istio proxy configured, prevent communication with that pod.)
   configuration of which identities are allowed to call services, and
   which services are allowed to interact with other services.
 
+# CHANGELOG
+* 1.0.3 -- 2024-07-30
+  - updated image module
+  - bumped version
+* 1.0.2 -- 2024-07-22
+  - updated istio chart/app to 1.22.3
+  - add force_delete and lifecycle policies to copy_images
+  - updated version.tf to 1.0.2
+  - included module.images in depends on helm charts
+  - created changelog
+
 ## Requirements
 
 | Name | Version |
@@ -69,4 +80,3 @@ have a istio proxy configured, prevent communication with that pod.)
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_images"></a> [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | 2.0.2 |
-

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,11 @@ 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
+}

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

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"
 

main.tf

@@ -62,6 +62,7 @@ data "kubernetes_service" "apiserver" {
 }
 
 resource "helm_release" "base" {
+  depends_on = [module.images]
   chart      = "base"
   name       = "istio-base"
   namespace  = kubernetes_namespace.ns.metadata[0].name
@@ -88,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 {
@@ -126,9 +127,16 @@ 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-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}"])
+    value = join("\\,", [for key, value in local.tags : "${key}=${value}"])
   }
 
   dynamic "set" {
@@ -163,6 +171,8 @@ resource "helm_release" "ingress" {
       value = set.value.port
     }
   }
+
+  timeout = 90
 }
 
 resource "helm_release" "egress" {
@@ -180,5 +190,6 @@ resource "helm_release" "egress" {
     name  = "service.type"
     value = "ClusterIP"
   }
-}
 
+  timeout = 90
+}

outputs.tf

@@ -11,4 +11,3 @@ output "module_version" {
   description = "The version of this module."
   value       = local._module_version
 }
-

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" {
@@ -61,4 +61,3 @@ variable "enable_egress_gateway" {
   type        = bool
   default     = true
 }
-

version.tf

@@ -1,4 +1,4 @@
 locals {
   _module_name    = "tfmod-istio"
-  _module_version = "1.0.1"
+  _module_version = "1.0.3"
 }