Skip to content

Commit 7d92299

Browse files
authored
user-auth namespace is created by auth db-script (#188)
* user-auth namespace is created by auth db-script * prometheus exporter to depend_on prometheus * fix external dns not creating route53 entry
1 parent e768623 commit 7d92299

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ data "aws_iam_policy_document" "cert_manager_policy_doc" {
161161
"route53:ListResourceRecordSets"
162162
]
163163

164-
resources = [for domain in var.external_dns_zones : "arn:aws:route53:::hostedzone/${domain}"]
164+
resources = [for index, domain in var.external_dns_zones : "arn:aws:route53:::hostedzone/${data.aws_route53_zone.zones[index].zone_id}"]
165165
}
166166

167167
statement {

templates/kubernetes/terraform/modules/kubernetes/external_dns.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ data "aws_iam_policy_document" "external_dns_policy_doc" {
3434

3535
actions = ["route53:ChangeResourceRecordSets"]
3636

37-
resources = [for domain in var.external_dns_zones : "arn:aws:route53:::hostedzone/${domain}"]
37+
// data.aws_route53_zone.zones declared in ./cert-manager.tf
38+
resources = [for index, domain in var.external_dns_zones : "arn:aws:route53:::hostedzone/${data.aws_route53_zone.zones[index].zone_id}"]
3839
}
3940
}
4041

templates/kubernetes/terraform/modules/kubernetes/metrics/prometheus/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,5 @@ resource "helm_release" "elasticsearch_prometheus_exporter" {
221221
name = "serviceMonitor.enabled"
222222
value = "true"
223223
}
224+
depends_on = [helm_release.prometheus_stack]
224225
}

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

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

1515
project = var.user_auth[count.index].name
1616
auth_namespace = var.user_auth[count.index].auth_namespace
17+
create_namespace = false
1718
frontend_service_domain = var.user_auth[count.index].frontend_service_domain
1819
backend_service_domain = var.user_auth[count.index].backend_service_domain
1920
user_auth_mail_from_address = var.user_auth[count.index].user_auth_mail_from_address

0 commit comments

Comments
 (0)