From 8a41863d6ae797dd3fb06193f0800fbef50f2f85 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Thu, 2 Mar 2023 14:02:33 +0100 Subject: [PATCH] more fixes --- library/common/templates/class/_cnpgCluster.tpl | 9 --------- library/common/templates/spawner/_cnpg.tpl | 4 ---- 2 files changed, 13 deletions(-) diff --git a/library/common/templates/class/_cnpgCluster.tpl b/library/common/templates/class/_cnpgCluster.tpl index 6bfd4a8f..7dc7db37 100644 --- a/library/common/templates/class/_cnpgCluster.tpl +++ b/library/common/templates/class/_cnpgCluster.tpl @@ -69,13 +69,4 @@ spec: inProgress: false reusePVC: on - # externalClusters: - # - name: old-db - # connectionParameters: - # host: somehost - # user: postgres - # password: - # name: somepass-superuser - # key: password - {{- end -}} diff --git a/library/common/templates/spawner/_cnpg.tpl b/library/common/templates/spawner/_cnpg.tpl index 695045cb..80633cc7 100644 --- a/library/common/templates/spawner/_cnpg.tpl +++ b/library/common/templates/spawner/_cnpg.tpl @@ -26,9 +26,6 @@ {{- include "tc.v1.common.class.cnpg.pooler" $ }} {{- end }} - {{- $basename := include "tc.v1.common.lib.chart.names.fullname" $ }} - {{- $fetchname := printf "%s-dbcreds" $basename }} - {{/* Inject the required secrets */}} {{- $dbPass := "" }} {{- $dbprevious := lookup "v1" "Secret" $.Release.Namespace ( printf "%s-user" $cnpgValues.name ) }} @@ -61,7 +58,6 @@ {{- $_ := set $cnpgValues.creds "host" $host }} {{- $_ := set $cnpgValues.creds "jdbc" $jdbc }} - {{- if $cnpgValues.monitoring }} {{- if $cnpgValues.monitoring.enablePodMonitor }} {{- $poolermetrics := include "tc.v1.common.lib.cnpg.metrics.pooler" (dict "poolerName" ( printf "%s-rw" $cnpgValues.name) ) | fromYaml }}