Refacto and add modules

postgresql/postgresql.tf

@@ -1,21 +1,21 @@
 locals {
-  app_slug   = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
-  pg-labels = merge(local.labels, {
+  app_slug   = "${var.instance}${var.component == "" ? "" : "-"}${var.component}"
+  pg_labels = merge(var.labels, {
     "app.kubernetes.io/component" = "pg"
   })
-  pool-labels = merge(local.labels, {
+  pool_labels = merge(var.labels, {
     "app.kubernetes.io/component" = "pg-pool"
   })
 }
 
-resource "kubectl_manifest" "prj_pg" {
+resource "kubectl_manifest" "pg" {
   yaml_body  = join("", concat([<<-EOF
     apiVersion: postgresql.cnpg.io/v1
     kind: Cluster
     metadata:
       name: "${local.app_slug}-pg"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.pg-labels)}
+      labels: ${jsonencode(local.pg_labels)}
       annotations:
         "k8up.io/backupcommand": "pg_dump -U postgres -d ${var.component} --clean"
         "k8up.io/file-extension": ".sql"
@@ -34,7 +34,7 @@ resource "kubectl_manifest" "prj_pg" {
   ], var.backups.enable&&var.backups.use_barman?[<<-EOF
       backup:
         barmanObjectStore:
-          destinationPath: "s3://${var.app_slug}-${var.namespace}/"
+          destinationPath: "s3://${local.app_slug}-${var.namespace}/"
           endpointURL: "${var.backups.endpoint}/barman"
           s3Credentials:
             accessKeyId:
@@ -47,7 +47,7 @@ resource "kubectl_manifest" "prj_pg" {
   ]:[""]))
 }
 
-resource "kubectl_manifest" "prj_pg_backup" {
+resource "kubectl_manifest" "pg_backup" {
   count = var.backups.enable ? 1:0
   yaml_body  = <<-EOF
     apiVersion: postgresql.cnpg.io/v1
@@ -55,7 +55,7 @@ resource "kubectl_manifest" "prj_pg_backup" {
     metadata:
       name: "${local.app_slug}-pg"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.pg-labels)}
+      labels: ${jsonencode(local.pg_labels)}
     spec:
       schedule: "${var.backups.schedule.db}"
       backupOwnerReference: self
@@ -64,15 +64,15 @@ resource "kubectl_manifest" "prj_pg_backup" {
   EOF
 }
 
-resource "kubectl_manifest" "prj_pg_pool" {
-  depends_on = [kubectl_manifest.prj_pg]
+resource "kubectl_manifest" "pg_pool" {
+  depends_on = [kubectl_manifest.pg]
   yaml_body  = <<-EOF
     apiVersion: postgresql.cnpg.io/v1
     kind: Pooler
     metadata:
       name: "${local.app_slug}-pool"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.pool-labels)}
+      labels: ${jsonencode(local.pool_labels)}
     spec:
       cluster:
         name: "${local.app_slug}-pg"
@@ -85,3 +85,11 @@ resource "kubectl_manifest" "prj_pg_pool" {
           default_pool_size: "10"
   EOF
 }
+
+data "kubernetes_secret_v1" "credentials" {
+  depends_on = [ kubectl_manifest.pg ]
+  metadata {
+    name = "${local.app_slug}-pg-app"
+    namespace = var.namespace
+  }
+}