Skip to content

Update deploys to work smoothly when new services are added #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liam-lloyd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update deploys to work smoothly when new services are added #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terraform/test_cluster/access_copy_dev_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "access_copy_dev_lambda" {
count = local.need_dev_images ? 1 : 0
function_name = "access-copy-dev-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/access_copy_staging_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "access_copy_staging_lambda" {
count = local.need_staging_images ? 1 : 0
function_name = "access-copy-staging-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/account_space_dev_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "account_space_update_dev_lambda" {
count = local.need_dev_images ? 1 : 0
function_name = "account-space-update-dev-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/account_space_staging_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "account_space_update_staging_lambda" {
count = local.need_staging_images ? 1 : 0
function_name = "account-space-update-staging-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/am_cleanup_dev_cronjob.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "archivematica_cleanup_dev" {
count = local.need_dev_images ? 1 : 0
kind = "CronJob"
api_version = "batch/v1"
metadata { name = "archivematica-cleanup-dev" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/am_cleanup_staging_cronjob.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "archivematica_cleanup_staging" {
count = local.need_staging_images ? 1 : 0
kind = "CronJob"
api_version = "batch/v1"
metadata { name = "archivematica-cleanup-staging" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/file_url_refresh_dev_cronjob.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "file_url_refresh_dev" {
count = local.need_dev_images ? 1 : 0
kind = "CronJob"
api_version = "batch/v1"
metadata { name = "file-url-refresh-dev" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/file_url_refresh_staging_cronjob.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "file_url_refresh_staging" {
count = local.need_staging_images ? 1 : 0
kind = "CronJob"
api_version = "batch/v1"
metadata { name = "file-url-refresh-staging" }
Expand Down
82 changes: 44 additions & 38 deletions terraform/test_cluster/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,53 @@
locals {
current_stela_dev_deploy = data.kubernetes_resource.stela_dev.object
current_stela_staging_deploy = data.kubernetes_resource.stela_staging.object
required_dev_images = [
"access-copy-dev-lambda",
"account-space-update-dev-lambda",
"archivematica-cleanup-dev",
"file-url-refresh-dev",
"metadata-attacher-dev-lambda",
"record-thumbnail-dev-lambda",
"stela-dev",
"thumbnail-refresh-dev",
"trigger-archivematica-dev-lambda",
]
required_staging_images = [
"access-copy-staging-lambda",
"account-space-update-staging-lambda",
"archivematica-cleanup-staging",
"file-url-refresh-staging",
"metadata-attacher-staging-lambda",
"record-thumbnail-staging-lambda",
"stela-staging",
"thumbnail-refresh-staging",
"trigger-archivematica-staging-lambda",
]

current_archivematica_cleanup_dev_deploy = data.kubernetes_resource.archivematica_cleanup_dev.object
current_archivematica_cleanup_staging_deploy = data.kubernetes_resource.archivematica_cleanup_staging.object
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_thumbnail_refresh_dev_deploy = data.kubernetes_resource.thumbnail_refresh_dev.object
current_thumbnail_refresh_staging_deploy = data.kubernetes_resource.thumbnail_refresh_staging.object

current_file_url_refresh_dev_deploy = data.kubernetes_resource.file_url_refresh_dev.object
current_file_url_refresh_staging_deploy = data.kubernetes_resource.file_url_refresh_staging.object

current_containers = concat(
try(local.current_stela_dev_deploy.spec.template.spec.containers),
try(local.current_stela_staging_deploy.spec.template.spec.containers),
try(local.current_archivematica_cleanup_dev_deploy.spec.jobTemplate.spec.template.spec.containers),
try(local.current_archivematica_cleanup_staging_deploy.spec.jobTemplate.spec.template.spec.containers),
try(local.current_thumbnail_refresh_dev_deploy.spec.jobTemplate.spec.template.spec.containers),
try(local.current_thumbnail_refresh_staging_deploy.spec.jobTemplate.spec.template.spec.containers),
try(local.current_file_url_refresh_dev_deploy.spec.jobTemplate.spec.template.spec.containers),
try(local.current_file_url_refresh_staging_deploy.spec.jobTemplate.spec.template.spec.containers)
current_kubernetes_images = merge(
try({ for container in data.kubernetes_resource.stela_dev[0].object.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.stela_staging[0].object.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.archivematica_cleanup_dev[0].object.spec.jobTemplate.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.archivematica_cleanup_staging[0].object.spec.jobTemplate.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.thumbnail_refresh_dev[0].object.spec.jobTemplate.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.thumbnail_refresh_staging[0].object.spec.jobTemplate.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.file_url_refresh_dev[0].object.spec.jobTemplate.spec.template.spec.containers : container.name => container.image }, {}),
try({ for container in data.kubernetes_resource.file_url_refresh_staging[0].object.spec.jobTemplate.spec.template.spec.containers : container.name => container.image }, {}),
)

current_kubernetes_images = { for container in local.current_containers : container.name => container.image }
current_lambda_images = {
account-space-update-dev-lambda = try(data.aws_lambda_function.account_space_update_dev_lambda.image_uri, null)
account-space-update-staging-lambda = try(data.aws_lambda_function.account_space_update_staging_lambda.image_uri, null)
access-copy-dev-lambda = try(data.aws_lambda_function.access_copy_dev_lambda.image_uri, null)
access-copy-staging-lambda = try(data.aws_lambda_function.access_copy_staging_lambda.image_uri, null)
metadata-attacher-dev-lambda = try(data.aws_lambda_function.metadata_attacher_dev_lambda.image_uri, null)
metadata-attacher-staging-lambda = try(data.aws_lambda_function.metadata_attacher_staging_lambda.image_uri, null)
record-thumbnail-dev-lambda = try(data.aws_lambda_function.record_thumbnail_dev_lambda.image_uri, null)
record-thumbnail-staging-lambda = try(data.aws_lambda_function.record_thumbnail_staging_lambda.image_uri, null)
trigger-archivematica-dev-lambda = try(data.aws_lambda_function.trigger_archivematica_dev_lambda.image_uri, null)
trigger-archivematica-staging-lambda = try(data.aws_lambda_function.trigger_archivematica_staging_lambda.image_uri, null)
account-space-update-dev-lambda = try(data.aws_lambda_function.account_space_update_dev_lambda[0].image_uri, null)
account-space-update-staging-lambda = try(data.aws_lambda_function.account_space_update_staging_lambda[0].image_uri, null)
access-copy-dev-lambda = try(data.aws_lambda_function.access_copy_dev_lambda[0].image_uri, null)
access-copy-staging-lambda = try(data.aws_lambda_function.access_copy_staging_lambda[0].image_uri, null)
metadata-attacher-dev-lambda = try(data.aws_lambda_function.metadata_attacher_dev_lambda[0].image_uri, null)
metadata-attacher-staging-lambda = try(data.aws_lambda_function.metadata_attacher_staging_lambda[0].image_uri, null)
record-thumbnail-dev-lambda = try(data.aws_lambda_function.record_thumbnail_dev_lambda[0].image_uri, null)
record-thumbnail-staging-lambda = try(data.aws_lambda_function.record_thumbnail_staging_lambda[0].image_uri, null)
trigger-archivematica-dev-lambda = try(data.aws_lambda_function.trigger_archivematica_dev_lambda[0].image_uri, null)
trigger-archivematica-staging-lambda = try(data.aws_lambda_function.trigger_archivematica_staging_lambda[0].image_uri, null)
}
current_images = merge(local.current_kubernetes_images, local.current_lambda_images)

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)
}
1 change: 1 addition & 0 deletions terraform/test_cluster/metadata_attacher_dev_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "metadata_attacher_dev_lambda" {
count = local.need_dev_images ? 1 : 0
function_name = "metadata-attacher-dev-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/metadata_attacher_staging_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "metadata_attacher_staging_lambda" {
count = local.need_staging_images ? 1 : 0
function_name = "metadata-attacher-staging-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/record_thumbnail_dev_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "record_thumbnail_dev_lambda" {
count = local.need_dev_images ? 1 : 0
function_name = "record-thumbnail-dev-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/record_thumbnail_staging_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "record_thumbnail_staging_lambda" {
count = local.need_staging_images ? 1 : 0
function_name = "record-thumbnail-staging-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/stela_dev_deployment.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "stela_dev" {
count = local.need_dev_images ? 1 : 0
kind = "Deployment"
api_version = "apps/v1"
metadata { name = "stela-dev" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/stela_staging_deployment.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "stela_staging" {
count = local.need_staging_images ? 1 : 0
kind = "Deployment"
api_version = "apps/v1"
metadata { name = "stela-staging" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/thumbnail_refresh_dev_cronjob.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "thumbnail_refresh_dev" {
count = local.need_dev_images ? 1 : 0
kind = "CronJob"
api_version = "batch/v1"
metadata { name = "thumbnail-refresh-dev" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/thumbnail_refresh_staging_cronjob.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "kubernetes_resource" "thumbnail_refresh_staging" {
count = local.need_staging_images ? 1 : 0
kind = "CronJob"
api_version = "batch/v1"
metadata { name = "thumbnail-refresh-staging" }
Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/trigger_archivematica_dev_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "trigger_archivematica_dev_lambda" {
count = local.need_dev_images ? 1 : 0
function_name = "trigger-archivematica-dev-lambda"
}

Expand Down
1 change: 1 addition & 0 deletions terraform/test_cluster/trigger_archivematica_staging_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
data "aws_lambda_function" "trigger_archivematica_staging_lambda" {
count = local.need_staging_images ? 1 : 0
function_name = "trigger-archivematica-staging-lambda"
}

Expand Down