From f9fbb8ed6bef7031a303d89502c1a24354e85ab0 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 21 Apr 2025 13:47:51 -0400 Subject: [PATCH] pass in registry for exporter --- keycloak-db-values.yaml | 8 +++++++- keycloak-server-values.yaml | 4 ++-- main.tf | 13 +++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/keycloak-db-values.yaml b/keycloak-db-values.yaml index fbed636..9817017 100644 --- a/keycloak-db-values.yaml +++ b/keycloak-db-values.yaml @@ -1,5 +1,6 @@ # See https://github.com/bitnami/charts/tree/master/bitnami/postgresql global: + imageRegistry: ${registry} security: allowInsecureImages: true postgresql: @@ -14,7 +15,8 @@ global: image: registry: repository: - tag: + tag: ${tag} + primary: resources: requests: @@ -34,6 +36,10 @@ readReplicas: # To enable metrics we need to pull in the posgresql-exporter image metrics: enabled: true + image: + repository: ${repository} + tag: ${exporter_tag} + persistence: enabled: true diff --git a/keycloak-server-values.yaml b/keycloak-server-values.yaml index 1dd0101..3614a0c 100644 --- a/keycloak-server-values.yaml +++ b/keycloak-server-values.yaml @@ -41,8 +41,8 @@ resources: cpu: 500m memory: 1024Mi limits: - cpu: 1 - memory: 4096Mi + cpu: 500m + memory: 1024Mi database: vendor: postgres diff --git a/main.tf b/main.tf index 73ae8ae..9805d54 100644 --- a/main.tf +++ b/main.tf @@ -117,6 +117,19 @@ resource "helm_release" "keycloak-db" { name = "image.tag" value = var.postgresql_tag } + + set { + name = "metrics.image.registry" + value = module.images.images[local.postgres_exporter_key].dest_registry + } + set { + name = "metrics.image.repository" + value = module.images.images[local.postgres_exporter_key].dest_registry + } + set { + name = "metrics.image.tag" + value = var.postgres_exporter_tag + } } data "kubernetes_secret" "db-secrets" {