feat: Optional upload of images for GCP and AWS (#1290)

aneoconsulting · May 7, 2024 · eb7bcbe · eb7bcbe
2 parents f31f650 + fdc57b1
commit eb7bcbe
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [main](https://github.com/aneoconsulting/armonik/tree/main)
 
+Added
+-
+
+* Optional upload of images for GCP and AWS
+
 
 ## [v2.19.4](https://github.com/aneoconsulting/armonik/tree/v2.19.4) (2024-04-26)
 
@@ -15,23 +20,18 @@ Changed
 Changed
 -
 
-* Upgrade version of ArmoniK API from `3.16.0` to `3.17.0` [Changelog](https://github.com/aneoconsulting/ArmoniK.Api/r
-eleases).
-* Upgrade version of ArmoniK Core from `0.23.2` to `0.24.0` [Changelog](https://github.com/aneoconsulting/ArmoniK.Core/r
-eleases).
-* Upgrade version of ArmoniK Admin Gui from `0.11.6` to `0.11.8` [Changelog](https://github.com/aneoconsulting/ArmoniK.A
-dmin.GUI/releases).
+* Upgrade version of ArmoniK API from `3.16.0` to `3.17.0` [Changelog](https://github.com/aneoconsulting/ArmoniK.Api/releases).
+* Upgrade version of ArmoniK Core from `0.23.2` to `0.24.0` [Changelog](https://github.com/aneoconsulting/ArmoniK.Core/releases).
+* Upgrade version of ArmoniK Admin Gui from `0.11.6` to `0.11.8` [Changelog](https://github.com/aneoconsulting/ArmoniK.Admin.GUI/releases).
 * Upgrade version of ArmoniK Extensions Csharp from `0.14.2` to `0.14.4` [Changelog](https://github.com/aneoconsulting/ArmoniK.Extensions.Csharp/releases).
 
 ## [v2.19.2](https://github.com/aneoconsulting/armonik/tree/v2.19.2) (2024-04-05)
 
 Changed
 -
 
-* Upgrade version of ArmoniK Core from `0.23.0` to `0.23.2` [Changelog](https://github.com/aneoconsulting/ArmoniK.Core/r
-eleases).
-* Upgrade version of ArmoniK Admin Gui from `0.11.4` to `0.11.6` [Changelog](https://github.com/aneoconsulting/ArmoniK.A
-dmin.GUI/releases).
+* Upgrade version of ArmoniK Core from `0.23.0` to `0.23.2` [Changelog](https://github.com/aneoconsulting/ArmoniK.Core/releases).
+* Upgrade version of ArmoniK Admin Gui from `0.11.4` to `0.11.6` [Changelog](https://github.com/aneoconsulting/ArmoniK.Admin.GUI/releases).
 
 
 ## [v2.19.1](https://github.com/aneoconsulting/ArmoniK/tree/v2.19.1) (2024-03-29)

diff --git a/infrastructure/quick-deploy/aws/ecr.tf b/infrastructure/quick-deploy/aws/ecr.tf
@@ -58,10 +58,14 @@ locals {
   }]
 
   ecr_images_raw = { for rep in local.ecr_repositories :
-    rep.key => {
+    rep.key => var.upload_images ? {
       image = try(module.ecr.repositories[rep.name], null),
       name  = try(module.ecr.repositories[rep.name], null),
       tag   = rep.tag,
+      } : {
+      image = rep.image,
+      name  = rep.image,
+      tag   = rep.tag,
     }
   }
 
@@ -92,7 +96,7 @@ module "ecr" {
   source          = "./generated/infra-modules/container-registry/aws/ecr"
   aws_profile     = var.profile
   kms_key_id      = local.kms_key
-  repositories    = local.repositories
+  repositories    = var.upload_images ? local.repositories : []
   encryption_type = var.ecr.encryption_type
   tags            = local.tags
 }
diff --git a/infrastructure/quick-deploy/aws/variables.tf b/infrastructure/quick-deploy/aws/variables.tf
@@ -715,6 +715,12 @@ variable "authentication" {
   default = {}
 }
 
+variable "upload_images" {
+  description = "Whether the images are uploaded to the Artifact Registry or not"
+  type        = bool
+  default     = true
+}
+
 variable "armonik_versions" {
   description = "Versions of all the ArmoniK components"
   type = object({

diff --git a/infrastructure/quick-deploy/gcp/gar.tf b/infrastructure/quick-deploy/gcp/gar.tf
@@ -65,10 +65,14 @@ locals {
 
   docker_images_raw = {
     for rep in local.docker_repositories :
-    rep.key => {
+    rep.key => var.upload_images ? {
       image = try(module.artifact_registry.docker_repositories["${rep.image}:${rep.tag}"], null),
       name  = try(module.artifact_registry.docker_repositories["${rep.image}:${rep.tag}"], null),
       tag   = rep.tag,
+      } : {
+      image = rep.image,
+      name  = rep.image,
+      tag   = rep.tag,
     }
   }
 
@@ -96,7 +100,7 @@ module "default_images" {
 
 module "artifact_registry" {
   source        = "./generated/infra-modules/container-registry/gcp/artifact-registry"
-  docker_images = local.repositories
+  docker_images = var.upload_images ? local.repositories : {}
   name          = "${local.prefix}-docker-registry"
   description   = "All docker images for ArmoniK"
   kms_key_id    = local.kms_key_id

diff --git a/infrastructure/quick-deploy/gcp/variables.tf b/infrastructure/quick-deploy/gcp/variables.tf
@@ -180,6 +180,12 @@ variable "armonik_versions" {
   })
 }
 
+variable "upload_images" {
+  description = "Whether the images are uploaded to the Artifact Registry or not"
+  type        = bool
+  default     = true
+}
+
 variable "seq" {
   description = "Seq configuration (nullable)"
   type = object({