Skip to content
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

feat: Added SQS support to ArmoniK #1344

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

feat: Added SQS support to ArmoniK #1344

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
8 changes: 6 additions & 2 deletions infrastructure/quick-deploy/aws/armonik.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module "armonik" {
pod_configuration = null
}
}, v, {
service_account_name = "armonikserviceaccount"
polling_agent = merge(v.polling_agent, {
image = local.ecr_images["${v.polling_agent.image}:${try(coalesce(v.polling_agent.tag), "")}"].name
tag = local.ecr_images["${v.polling_agent.image}:${try(coalesce(v.polling_agent.tag), "")}"].tag
Expand All @@ -36,8 +37,9 @@ module "armonik" {
})]
}) }
control_plane = merge(var.control_plane, {
image = local.ecr_images["${var.control_plane.image}:${try(coalesce(var.control_plane.tag), "")}"].name
tag = local.ecr_images["${var.control_plane.image}:${try(coalesce(var.control_plane.tag), "")}"].tag
image = local.ecr_images["${var.control_plane.image}:${try(coalesce(var.control_plane.tag), "")}"].name
tag = local.ecr_images["${var.control_plane.image}:${try(coalesce(var.control_plane.tag), "")}"].tag
service_account_name = "armonikserviceaccount"
})
admin_gui = merge(var.admin_gui, {
image = local.ecr_images["${var.admin_gui.image}:${try(coalesce(var.admin_gui.tag), "")}"].name
Expand Down Expand Up @@ -76,4 +78,6 @@ module "armonik" {
image = local.ecr_images["${var.pod_deletion_cost.image}:${try(coalesce(var.pod_deletion_cost.tag), "")}"].image
tag = local.ecr_images["${var.pod_deletion_cost.image}:${try(coalesce(var.pod_deletion_cost.tag), "")}"].tag
})

depends_on = [module.aws_service_account]
}
10 changes: 10 additions & 0 deletions infrastructure/quick-deploy/aws/storage.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ module "mq" {
kms_key_id = local.kms_key
}

module "aws_service_account" {
AncientPatata marked this conversation as resolved.
Show resolved Hide resolved
namespace = local.namespace
source = "./generated/infra-modules/service-account/aws"
prefix = local.prefix
service_account_name = "armonikserviceaccount"
oidc_provider_arn = module.eks.aws_eks_module.oidc_provider_arn
oidc_issuer_url = module.eks.aws_eks_module.cluster_oidc_issuer_url
decrypt_policy_arn = aws_iam_policy.decrypt_object.arn
}

# MongoDB
module "mongodb" {
count = can(coalesce(var.mongodb_sharding)) ? 0 : 1
Expand Down
2 changes: 1 addition & 1 deletion versions.tfvars.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@
"mongodb" : { "repository": "oci://registry-1.docker.io/bitnamicharts", "version" : "16.2.2"},
"mongodb-sharded" : { "repository": "oci://registry-1.docker.io/bitnamicharts", "version" : "9.0.3" }
}
}
}
Loading