fix

share/authentik/postgresql.tf

@@ -2,26 +2,6 @@ locals {
   pg-labels = merge(local.common-labels, {
     "app.kubernetes.io/component" = "pg"
   })
-  pool-labels = merge(local.common-labels, {
-    "app.kubernetes.io/component" = "pg-pool"
-  })
-  backup-def = {
-    retentionPolicy = var.backups.retention.db
-    barmanObjectStore = {
-      destinationPath = "s3://${var.instance}-${var.namespace}/"
-      endpointURL = "${var.backups.endpoint}/barman"
-      s3Credentials = {
-        accessKeyId = {
-          name = var.backups.secret-name
-          key = var.backups.key-id-key
-        }
-        secretAccessKey = {
-          name = var.backups.secret-name
-          key = var.backups.secret-key
-        }
-      }
-    }
-  }
 }
 
 resource "kubectl_manifest" "prj_pg" {
@@ -36,17 +16,28 @@ resource "kubectl_manifest" "prj_pg" {
       instances: ${var.postgres.replicas}
       storage:
         size: "${var.postgres.storage}"
-      monitoring:
-        enablePodMonitor: true
       bootstrap:
         initdb:
           database: "${var.component}"
           owner: "${var.component}"
-      backup: ${jsonencode(var.backups.enable?local.backup-def:{})}
+      monitoring:
+        enablePodMonitor: true
+      backup:
+        barmanObjectStore:
+          destinationPath: "s3://${var.instance}-${var.namespace}/"
+          endpointURL: "${var.backups.endpoint}/barman"
+          s3Credentials:
+            accessKeyId:
+              name: "${var.backups.secret-name}"
+              key: "${var.backups.key-id-key}"
+            secretAccessKey:
+              name: "${var.backups.secret-name}"
+              key: "${var.backups.secret-key}"
   EOF
 }
 
 resource "kubectl_manifest" "prj_pg_backup" {
+  count = var.backup.enable ? 1:0
   yaml_body  = <<-EOF
     apiVersion: postgresql.cnpg.io/v1
     kind: ScheduledBackup
@@ -61,26 +52,3 @@ resource "kubectl_manifest" "prj_pg_backup" {
         name: "${var.instance}-${var.component}-pg"
   EOF
 }
-
-
-resource "kubectl_manifest" "prj_pg_pool" {
-  depends_on = [kubectl_manifest.prj_pg]
-  yaml_body  = <<-EOF
-    apiVersion: postgresql.cnpg.io/v1
-    kind: Pooler
-    metadata:
-      name: "${var.instance}-${var.component}-pool"
-      namespace: "${var.namespace}"
-      labels: ${jsonencode(local.pool-labels)}
-    spec:
-      cluster:
-        name: "${var.instance}-${var.component}-pg"
-      instances: 1
-      type: rw
-      pgbouncer:
-        poolMode: session
-        parameters:
-          max_client_conn: "1000"
-          default_pool_size: "10"
-  EOF
-}