From 0bb378f20de0c2fd14e73e17ed6c9a13ed1b39f9 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 22 Apr 2025 16:48:34 -0400
Subject: [PATCH] update images for utilites handling

---
 copy_images.tf |  9 ++++-----
 main.tf        | 12 ++++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/copy_images.tf b/copy_images.tf
index bdd87e5..f93abf0 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -3,9 +3,8 @@ locals {
   keycloak_key          = format("%v#%v", local.keycloak_name, var.keycloak_tag)
   postgresql_key        = format("%v#%v", "bitnami/postgresql", var.postgresql_tag)
   postgres_exporter_key = format("%v#%v", "bitnami/postgres-exporter", var.postgres_exporter_tag)
-  # tflint-ignore: terraform_unused_declarations
-  utilities_key  = format("%v#%v", "big-bang/utilities", "1.0.3")
-  ent_ecr_source = format("%v.%v.%v.%v", var.eecr_info.account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images")
+  utilities_key         = format("%v#%v", "big-bang/utilities", var.utilities_tag)
+  ent_ecr_source        = format("%v.%v.%v.%v", var.eecr_info.account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images")
 
   image_config = [
     {
@@ -41,8 +40,8 @@ locals {
       name            = "big-bang/utilities"
       source_image    = "big-bang/utilities"
       source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
-      source_tag      = "1.0.3"
-      tag             = "1.0.3"
+      source_tag      = var.utilities_tag
+      tag             = var.utilities_tag
     },
   ]
 }
diff --git a/main.tf b/main.tf
index 12109a8..80b65da 100644
--- a/main.tf
+++ b/main.tf
@@ -84,10 +84,8 @@ module "pre_install" {
   service_account_name = module.service_account.service_account_name
   job_name             = "keycloak-config-secret-job"
   config_script        = local.secrets_job_script
-  region               = var.region
-  cluster_name         = var.cluster_name
-
-  timeout = "5m"
+  utilities_image_path = module.images.images[local.utilities_key].dest_full_path
+  timeout              = "5m"
 }
 
 resource "helm_release" "keycloak-db" {
@@ -150,8 +148,7 @@ module "keycloak_db_config" {
   service_account_name = module.service_account.service_account_name
   job_name             = "keycloak-db-config-job"
   config_script        = local.db_config_job_script
-  region               = var.region
-  cluster_name         = var.cluster_name
+  utilities_image_path = module.images.images[local.utilities_key].dest_full_path
 
   timeout = "3m"
 }
@@ -208,8 +205,7 @@ module "post_install" {
   service_account_name = module.service_account.service_account_name
   job_name             = "keycloak-config-job"
   config_script        = local.config_job_script
-  region               = var.region
-  cluster_name         = var.cluster_name
+  utilities_image_path = module.images.images[local.utilities_key].dest_full_path
 
   timeout = "10m"
 }