Skip to content

Commit

Permalink
Merged in dev/fabien/MPC-4337-emsmgr-scaffolding-part2 (pull request e…
Browse files Browse the repository at this point in the history
…lastic#402)

MPC-4337: emsmgr EKS scaffolding

* 1 emsmgr per cluster, better default env

* add EMS_AUTH_SECRET


Approved-by: Can Yildiz
Approved-by: Gideon Avida
Approved-by: Andre Sodermans
  • Loading branch information
fabien committed Jan 28, 2022
1 parent 3dcd19b commit e139d93
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions aws/ams-cluster-v1-tf/eks.tf
Expand Up @@ -559,10 +559,10 @@ module "engageli_kubernetes_namespaces" {
"${pair[0]}_${pair[1]}_service_url" => "${pair[0]}.${pair[1]}.${local.stack_fqdn}"
}
)
# secrets are scoped to namespaces in k8s so we have some duplication
kubernetes_secrets = {
# connection string as a secret
REDIS_URL = "rediss://default:${aws_secretsmanager_secret_version.redis_pw.secret_string}@${aws_elasticache_replication_group.redis.primary_endpoint_address}"
REDIS_URL = "rediss://default:${aws_secretsmanager_secret_version.redis_pw.secret_string}@${aws_elasticache_replication_group.redis.primary_endpoint_address}"
EMS_AUTH_SECRET = aws_secretsmanager_secret_version.ems_auth_secret.secret_string
}
kubernetes_labels = {
stack_env = var.stack_env
Expand Down
18 changes: 12 additions & 6 deletions aws/ams-cluster-v1-tf/variables.tf
Expand Up @@ -484,7 +484,7 @@ locals {

# e.g. from curl https://checkip.amazonaws.com
dev_user_ips = [
"87.68.60.181/32", # nikita
"87.68.60.181/32", # nikita
"71.202.208.152/32", # alan
"98.33.38.126/32", # ttang2
"212.150.192.110/32", # Israel office
Expand Down Expand Up @@ -629,13 +629,13 @@ variable "asg_enabled_metrics" {

variable "force_multi_az" {
description = "force multi az for redis and postgres"
type = bool
default = false
type = bool
default = false
}

locals {
# enables multi-az multi-node for redis and postgres
enable_multi_az = var.stack_env != "dev" || var.force_multi_az == true
enable_multi_az = var.stack_env != "dev" || var.force_multi_az == true
cache_clusters_number = var.stack_env != "dev" || var.force_multi_az == true ? 2 : 1
# TODO provide an override for this?
# or set this as part of engageli_kubernetes_app_defaults?
Expand Down Expand Up @@ -708,8 +708,14 @@ variable "eks_ingress_nginx_config_map" {

variable "engageli_kubernetes_apps_overrides" {
description = "overrides for the map of kubernetes apps to deploy on this stack"
#type = map(any)
default = {}
default = {
class = {
emsmgr = {
replicas = 1
image_tag = "foo"
}
}
}
}

variable "eks_cluster_version" {
Expand Down

0 comments on commit e139d93

Please sign in to comment.