Skip to content

Commit 33aa175

Browse files
authored
auth-components name/secret for helm uniqueness (#190)
1 parent ad08769 commit 33aa175

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

templates/kubernetes/terraform/environments/prod/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ module "kubernetes" {
7979
domain_name = local.domain_name
8080
<% if eq (index .Params `userAuth`) "yes" %>user_auth = [
8181
{
82-
name = local.project
82+
name = local.project
8383
auth_namespace = "user-auth"
84+
kratos_secret_name = local.project
8485
frontend_service_domain = "<% index .Params `productionFrontendSubdomain` %>${local.domain_name}"
8586
backend_service_domain = "<% index .Params `productionBackendSubdomain` %>${local.domain_name}"
8687
whitelisted_return_urls = ["https://<% index .Params `productionFrontendSubdomain` %>${local.domain_name}"]

templates/kubernetes/terraform/environments/stage/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ module "kubernetes" {
7878
domain_name = local.domain_name
7979
<% if eq (index .Params `userAuth`) "yes" %>user_auth = [
8080
{
81-
name = local.project
81+
name = local.project
8282
auth_namespace = "user-auth"
83+
kratos_secret_name = local.project
8384
frontend_service_domain = "<% index .Params `stagingFrontendSubdomain` %>${local.domain_name}"
8485
backend_service_domain = "<% index .Params `stagingBackendSubdomain` %>${local.domain_name}"
8586
whitelisted_return_urls = ["https://<% index .Params `stagingFrontendSubdomain` %>${local.domain_name}"]

templates/kubernetes/terraform/modules/kubernetes/user_auth.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ locals {
1010
module "user_auth" {
1111
count = length(var.user_auth)
1212
source = "commitdev/zero/aws//modules/user_auth"
13-
version = "0.1.19"
13+
version = "0.1.21"
1414

15-
project = var.user_auth[count.index].name
15+
name = var.user_auth[count.index].name
1616
auth_namespace = var.user_auth[count.index].auth_namespace
1717
create_namespace = false
18+
kratos_secret_name = var.user_auth[count.index].kratos_secret_name
1819
frontend_service_domain = var.user_auth[count.index].frontend_service_domain
1920
backend_service_domain = var.user_auth[count.index].backend_service_domain
2021
user_auth_mail_from_address = var.user_auth[count.index].user_auth_mail_from_address

templates/kubernetes/terraform/modules/kubernetes/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ variable "user_auth" {
139139
frontend_service_domain = string
140140
backend_service_domain = string
141141
auth_namespace = string
142+
kratos_secret_name = string
142143
jwks_secret_name = string
143144
user_auth_mail_from_address = string
144145
whitelisted_return_urls = list(string)

0 commit comments

Comments
 (0)