From 987eff45ad0db03fa9fbe97f483cf49d2b562a31 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 10 Nov 2023 17:38:12 -0500 Subject: [PATCH] db users --- .../templates/_helpers/user-generation/terraform.tf.tpl | 6 ++++-- k8s/apps/db-users/templates/users-job.yaml | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) 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 60dc6f2..4aa1185 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 @@ -51,9 +51,11 @@ locals { var.db_users[u] => pwd.result } users_db = flatten([ - for user, dbs in var.db_users_dbs: - for db in dbs: + for user, dbs in var.db_users_dbs: [ + for db in dbs: [ {"db": db, "user": user} + ] + ] ]) } diff --git a/k8s/apps/db-users/templates/users-job.yaml b/k8s/apps/db-users/templates/users-job.yaml index b432d49..32e9d1e 100644 --- a/k8s/apps/db-users/templates/users-job.yaml +++ b/k8s/apps/db-users/templates/users-job.yaml @@ -11,6 +11,11 @@ metadata: checksum/users_dbs-tfvars: "{{ (print "db_users_dbs = " ( .Values.userGeneration.users_dbs | toJson )) | sha256sum }}" spec: template: + annotations: + checksum/run-sh: "{{ include "pg-users.entry" . | sha256sum }}" + checksum/main-tf: "{{ include "pg-users.terraform" . | sha256sum }}" + checksum/users-tfvars: "{{ (print "db_users = " ( .Values.userGeneration.users | toJson )) | sha256sum }}" + checksum/users_dbs-tfvars: "{{ (print "db_users_dbs = " ( .Values.userGeneration.users_dbs | toJson )) | sha256sum }}" spec: serviceAccount: "{{ .Release.Name }}" serviceAccountName: "{{ .Release.Name }}"