From a052a0682f1085f612a2a2a5699c1f1b753947de Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 30 Jul 2024 18:06:35 -0400
Subject: [PATCH] initial

---
 copy_images.tf |  7 +++++--
 main.tf        | 11 +++++------
 outputs.tf     | 14 ++++++++++++++
 version.tf     |  3 +--
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/copy_images.tf b/copy_images.tf
index 279ea35..96d815f 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -26,7 +26,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
@@ -42,5 +42,8 @@ module "images" {
   ##  region               = ""
   ##  source_password      = ""
   ##  source_username      = ""
-}
 
+  enable_lifecycle_policy = true
+  lifecycle_policy_all    = true
+  force_delete            = true
+}
diff --git a/main.tf b/main.tf
index 6ffb7d4..07949f3 100644
--- a/main.tf
+++ b/main.tf
@@ -71,15 +71,13 @@ data "kubernetes_namespace" "keycloak" {
 }
 
 module "service_account" {
-  #source = "git@github.it.census.gov:SOA/tfmod-config-job.git//service-account?ref=1.0.0"
-  source = "git@github.it.census.gov:SOA/tfmod-config-job.git//service-account"
+  source = "git@github.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account"
 
   namespace = local.ns
 }
 
 module "preinstall" {
-  #source = "git@github.it.census.gov:SOA/tfmod-config-job.git//config-job?ref=1.0.0"
-  source = "git@github.it.census.gov:SOA/tfmod-config-job.git//config-job"
+  source = "git@github.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job"
 
   namespace            = local.ns
   service_account_name = module.service_account.service_account_name
@@ -88,6 +86,7 @@ module "preinstall" {
 }
 
 resource "helm_release" "kiali-operator" {
+  depends_on = [module.image]
   chart      = "kiali-operator"
   version    = var.kiali_operator_version
   name       = "kiali-operator"
@@ -118,6 +117,7 @@ resource "helm_release" "kiali-operator" {
 
 resource "helm_release" "kiali" {
   depends_on = [
+    module.image,
     helm_release.kiali-operator,
     module.preinstall,
   ]
@@ -209,8 +209,7 @@ resource "helm_release" "kiali" {
 module "kiali_ingress" {
   depends_on = [helm_release.kiali]
 
-  #source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//>ref=1.0.0"
-  source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//"
+  source = "git@github.it.census.gov:SCT-Engineering/tfmod-gogatekeeper.git//"
 
   certificate_issuer = var.certificate_issuer
 
diff --git a/outputs.tf b/outputs.tf
index b0c6e23..a064480 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -16,3 +16,17 @@ output "internal_endpoint" {
     url         = local.internal_url
   }
 }
+
+################################################################################
+# Module information
+################################################################################
+
+output "module_name" {
+  description = "The name of this module."
+  value       = local._module_name
+}
+
+output "module_version" {
+  description = "The version of this module."
+  value       = local._module_version
+}
diff --git a/version.tf b/version.tf
index 1d877c4..8cfd906 100644
--- a/version.tf
+++ b/version.tf
@@ -1,5 +1,4 @@
 locals {
   _module_name    = "tfmod-kiali"
-  _module_version = "0.0.1"
-  _module_providers = ["helm", "kubernetes"]
+  _module_version = "0.0.2"
 }