diff --git a/k8s/apps/db-users/templates/_helpers/user-generation/entry.sh.tpl b/k8s/apps/db-users/templates/_helpers/user-generation/entry.sh.tpl index a45fc57..edc433d 100644 --- a/k8s/apps/db-users/templates/_helpers/user-generation/entry.sh.tpl +++ b/k8s/apps/db-users/templates/_helpers/user-generation/entry.sh.tpl @@ -5,5 +5,8 @@ cp -r /app /tmp/app cd /tmp/app && \ terraform init && \ - terraform apply -auto-approve -input=false -var-file="/app/users.tfvars" -lock=false + terraform apply -auto-approve -input=false \ + -var-file="/app/users.tfvars" \ + -var-file="/app/db_users_dbs.tfvars" \ + -lock=false {{- end -}} \ No newline at end of file diff --git a/k8s/apps/db-users/templates/_helpers/user-generation/terraform.tf.tpl b/k8s/apps/db-users/templates/_helpers/user-generation/terraform.tf.tpl index e730b86..60dc6f2 100644 --- a/k8s/apps/db-users/templates/_helpers/user-generation/terraform.tf.tpl +++ b/k8s/apps/db-users/templates/_helpers/user-generation/terraform.tf.tpl @@ -5,11 +5,15 @@ variable "db_password" {} variable "db_users" { type = list(string) } +variable "db_users_dbs" { + type = map(list(string)) + default = {} +} terraform { required_providers { postgresql = { source = "cyrilgdn/postgresql" - version = "1.18.0" + version = "{{.Values.terraform.cyrilgdnPostgresql.tag}}" } } } @@ -46,6 +50,11 @@ locals { for u, pwd in random_password.pg_users_pswd : var.db_users[u] => pwd.result } + users_db = flatten([ + for user, dbs in var.db_users_dbs: + for db in dbs: + {"db": db, "user": user} + ]) } resource "kubernetes_secret" "pg_users" { @@ -79,5 +88,11 @@ resource "postgresql_database" "db" { owner = postgresql_role.u[each.key].id } +resource "postgresql_database" "db_users" { + for_each = local.users_db + name = each.value.db + owner = postgresql_role.u[each.value.user].id +} + {{- end -}} \ No newline at end of file diff --git a/k8s/apps/db-users/templates/users-secret.yaml b/k8s/apps/db-users/templates/users-secret.yaml index 1cdbc36..439359e 100644 --- a/k8s/apps/db-users/templates/users-secret.yaml +++ b/k8s/apps/db-users/templates/users-secret.yaml @@ -9,3 +9,4 @@ data: run.sh: "{{ include "pg-users.entry" . | b64enc }}" main.tf: "{{ include "pg-users.terraform" . | b64enc }}" users.tfvars: "{{ (print "db_users = " ( .Values.userGeneration.users | toJson )) | b64enc }}" + db_users_dbs.tfvars: "{{ (print "db_users_dbs = " ( .Values.userGeneration.users_dbs | toJson )) | b64enc }}" diff --git a/k8s/apps/db-users/values.yaml b/k8s/apps/db-users/values.yaml index 3aa5976..02ef14e 100644 --- a/k8s/apps/db-users/values.yaml +++ b/k8s/apps/db-users/values.yaml @@ -3,5 +3,14 @@ userGeneration: users: - nextcloud - authentik + - radarr + - sonarr + users_dbs: + radarr: [radarr-main, radarr-log] + sonarr: [sonarr-main, sonarr-log] postgresSecret: "" + +terraform: + cyrilgdnPostgresql: + tag: 1.18.0 \ No newline at end of file