Update how images are set to avoid deploy failures

Currently, deploys will fail if existing copies of our deployments can't
be found, even if values for all the images have been specified in
image_overrides. This commit updates the config to only require existing
image values when they're actually needed.

Author: liam-lloyd

archivematica/prod_cluster/archivematica_deployment.tf

@@ -1,4 +1,5 @@
 data "kubernetes_resource" "archivematica_prod" {
+  count       = local.need_images ? 1 : 0
   kind        = "Deployment"
   api_version = "apps/v1"
   metadata { name = "archivematica-prod" }
@@ -563,6 +564,7 @@ resource "kubernetes_deployment" "archivematica_prod" {
 }
 
 data "kubernetes_resource" "mcp_client_prod" {
+  count       = local.need_images ? 1 : 0
   kind        = "Deployment"
   api_version = "apps/v1"
   metadata { name = "archivematica-mcp-client-prod" }

archivematica/prod_cluster/locals.tf

@@ -1,19 +1,19 @@
 locals {
+  required_images = [
+    "archivematica-storage-service-prod",
+    "archivematica-dashboard-prod",
+    "archivematica-mcp-server-prod",
+    "archivematica-mcp-client-prod",
+  ]
+
+  need_images = length(setsubtract(local.required_images, keys(var.image_overrides))) > 0
   current_archivematica_prod_deploy = data.kubernetes_resource.archivematica_prod.object
   current_mcp_client_prod_deploy    = data.kubernetes_resource.mcp_client_prod.object
 
-  current_containers = concat(
-    try(local.current_archivematica_prod_deploy.spec.template.spec.containers),
-    try(local.current_mcp_client_prod_deploy.spec.template.spec.containers)
+  current_images = merge(
+    try(for container in data.kubernetes_resource.archivematica_prod[0].object.spec.template.spec.containers : container.name => container.image }, {}),
+    try(for container in data.kubernetes_resource.mcp_client_prod[0].object.spec.template.spec.containers : container.name => container.image }, {}),
   )
 
-  current_images = { for container in local.current_containers : container.name => container.image }
-
-  desired_images = {
-    for name, image in local.current_images :
-    name => (contains(keys(var.image_overrides), name)
-      ? var.image_overrides[name]
-      : local.current_images[name]
-    )
-  }
+  desired_images = merge(local.current_images, var.image_overrides)
 }

archivematica/test_cluster/dev_archivematica_deployment.tf

@@ -1,4 +1,5 @@
 data "kubernetes_resource" "archivematica_dev" {
+  count       = local.need_dev_images ? 1 : 0
   kind        = "Deployment"
   api_version = "apps/v1"
   metadata { name = "archivematica-dev" }
@@ -563,6 +564,7 @@ resource "kubernetes_deployment" "archivematica_dev" {
 }
 
 data "kubernetes_resource" "mcp_client_dev" {
+  count       = local.need_dev_images ? 1 : 0
   kind        = "Deployment"
   api_version = "apps/v1"
   metadata { name = "archivematica-mcp-client-dev" }

archivematica/test_cluster/locals.tf

@@ -1,24 +1,27 @@
 locals {
-  current_archivematica_dev_deploy = data.kubernetes_resource.archivematica_dev.object
-  current_mcp_client_dev_deploy    = data.kubernetes_resource.mcp_client_dev.object
+  required_dev_images = [
+    "archivematica-storage-service-dev",
+    "archivematica-dashboard-dev",
+    "archivematica-mcp-server-dev",
+    "archivematica-mcp-client-dev",
+  ]
 
-  current_archivematica_staging_deploy = data.kubernetes_resource.archivematica_staging.object
-  current_mcp_client_staging_deploy    = data.kubernetes_resource.mcp_client_staging.object
+  required_staging_images = [
+    "archivematica-storage-service-staging",
+    "archivematica-dashboard-staging",
+    "archivematica-mcp-server-staging",
+    "archivematica-mcp-client-staging",
+  ]
 
-  current_containers = concat(
-    try(local.current_archivematica_dev_deploy.spec.template.spec.containers),
-    try(local.current_mcp_client_dev_deploy.spec.template.spec.containers),
-    try(local.current_archivematica_staging_deploy.spec.template.spec.containers),
-    try(local.current_mcp_client_staging_deploy.spec.template.spec.containers)
-  )
+  need_dev_images     = length(setsubtract(local.required_dev_images, keys(var.image_overrides))) > 0
+  need_staging_images = length(setsubtract(local.required_staging_images, keys(var.image_overrides))) > 0
 
-  current_images = { for container in local.current_containers : container.name => container.image }
+  current_images = merge(
+    try({ for container in data.kubernetes_resource.archivematica_dev[0].object.spec.template.spec.containers : container.name => container.image }, {}),
+    try({ for container in data.kubernetes_resource.mcp_client_dev[0].object.spec.template.spec.containers : container.name => container.image }, {}),
+    try({ for container in data.kubernetes_resource.archivematica_staging[0].object.spec.template.spec.containers : container.name => container.image }, {}),
+    try({ for container in data.kubernetes_resource.mcp_client_staging[0].object.spec.template.spec.containers : container.name => container.image }, {}),
+  )
 
-  desired_images = {
-    for name, image in local.current_images :
-    name => (contains(keys(var.image_overrides), name)
-      ? var.image_overrides[name]
-      : local.current_images[name]
-    )
-  }
+  desired_images = merge(local.current_images, var.image_overrides)
 }

archivematica/test_cluster/staging_archivematica_deployment.tf

@@ -1,4 +1,5 @@
 data "kubernetes_resource" "archivematica_staging" {
+  count       = local.need_staging_images ? 1 : 0
   kind        = "Deployment"
   api_version = "apps/v1"
   metadata { name = "archivematica-staging" }
@@ -563,6 +564,7 @@ resource "kubernetes_deployment" "archivematica_staging" {
 }
 
 data "kubernetes_resource" "mcp_client_staging" {
+  count       = local.need_staging_images ? 1 : 0
   kind        = "Deployment"
   api_version = "apps/v1"
   metadata { name = "archivematica-mcp-client-staging" }