fixed ecr images issues

SCT-Engineering · Apr 14, 2025 · 287f124 · 287f124
1 parent 489f256
commit 287f124
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 24 deletions.
diff --git a/copy_images.tf b/copy_images.tf
@@ -1,24 +1,25 @@
 locals {
   kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version)
   kiali_server_key   = format("%v#%v", "istio-tools/kiali", var.kiali_application_version)
+  ent_ecr_source     = format("%v.%v.%v.%v", var.account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images")
 
   image_config = [
     ## Images for Kiali
     {
       enabled         = true
       dest_path       = null
       name            = "istio-tools/kiali-operator"
-      source_image    = "ironbank/opensource/kiali/kiali-operator"
-      source_registry = var.source_registry
+      source_image    = "opensource/kiali/kiali-operator"
+      source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
       source_tag      = var.kiali_application_version
       tag             = var.kiali_application_version
     },
     {
       enabled         = true
       dest_path       = null
       name            = "istio-tools/kiali"
-      source_image    = "ironbank/opensource/kiali/kiali"
-      source_registry = var.source_registry
+      source_image    = "opensource/kiali/kiali"
+      source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
       source_tag      = var.kiali_application_version
       tag             = var.kiali_application_version
     },
@@ -33,14 +34,22 @@ module "images" {
   image_config     = local.image_config
   tags             = {}
 
-  source_username  = data.aws_ecr_authorization_token.token.user_name
-  source_password  = data.aws_ecr_authorization_token.token.password
+  enable_lifecycle_policy     = true
+  lifecycle_policy_all        = true
+  force_delete                = true
+  lifecycle_policy_keep_count = 5
 
-  enable_lifecycle_policy = true
-  lifecycle_policy_all    = true
-  force_delete            = true
+  source_username = data.aws_ecr_authorization_token.ecr_token.user_name
+  source_password = data.aws_ecr_authorization_token.ecr_token.password
+
+  destination_username = data.aws_ecr_authorization_token.token.user_name
+  destination_password = data.aws_ecr_authorization_token.token.password
+}
+
+data "aws_ecr_authorization_token" "ecr_token" {
+  registry_id = var.account_id
 }
 
 data "aws_ecr_authorization_token" "token" {
-  registry_id = var.registry_id
+  registry_id = var.account_id
 }
diff --git a/variables.tf b/variables.tf
@@ -65,20 +65,6 @@ variable "kiali_operator_version" {
   default     = "1.73.0"
 }
 
-#source registry (enterpriser ecr account) where source image is being copied into target account
-variable "source_registry" {
-  description = "source of the image or enterprise ECR account"
-  type = string
-  default = "269222635945.dkr.ecr.us-gov-east-1.amazonaws.com/ent-images"
-}
-
-#source registry (enterpriser ecr account)
-variable "registry_id" {
-  description = "source of the image or enterprise ECR account"
-  type = string
-  default = "269222635945"
-}
-
 # See the [APP VERSION] found while determining kiali_operator_version
 # helm show values kiali/kiali-operator | grep tag:
 variable "kiali_application_version" {
@@ -92,3 +78,15 @@ variable "service_name" {
   type        = string
   default     = "kiali"
 }
+
+variable "account_id" {
+  description = "aws account number"
+  type        = string
+  default     = ""
+}
+
+variable "region" {
+  description = "region name"
+  type        = string
+  default     = "us-gov-east-1"
+}