truecharts/library-charts
1
0
Fork 0
mirror of https://github.com/truecharts/library-charts.git synced 2026-07-03 06:49:17 -03:00
Code Issues Packages Projects Releases Wiki Activity

chore(cnpg-pooler): re-apply the pooler urls

Browse Source
This commit is contained in:
Stavros kois
2024-01-21 22:51:22 +02:00
committed by Kjeld Schouten
parent 98ac79aa80
commit 2a4e3e70f4
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
library/common-test/tests/cnpg/credentials_test.yaml
View File

@@ -50,17 +50,17 @@ tests:
isSubset:
path: stringData
content:
porthost: test-release-name-common-test-cnpg-my-pg-rw:5432
host: test-release-name-common-test-cnpg-my-pg-rw
jdbc: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-rw:5432/test-db
porthost: test-release-name-common-test-cnpg-my-pg-pooler-rw:5432
host: test-release-name-common-test-cnpg-my-pg-pooler-rw
jdbc: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-pooler-rw:5432/test-db
- documentIndex: *secretDoc
matchRegex:
path: stringData.std
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-rw:5432/test-db
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-pooler-rw:5432/test-db
- documentIndex: *secretDoc
matchRegex:
path: stringData.nossl
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-rw:5432/test-db\?sslmode=disable
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-pooler-rw:5432/test-db\?sslmode=disable
- it: should generate correct secret with ro pooler
set:
@@ -86,28 +86,28 @@ tests:
isSubset:
path: stringData
content:
porthost: test-release-name-common-test-cnpg-my-pg-rw:5432
host: test-release-name-common-test-cnpg-my-pg-rw
jdbc: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-rw:5432/test-db
hostRO: test-release-name-common-test-cnpg-my-pg-ro
jdbcRO: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-ro:5432/test-db
porthostRO: test-release-name-common-test-cnpg-my-pg-ro:5432
porthost: test-release-name-common-test-cnpg-my-pg-pooler-rw:5432
host: test-release-name-common-test-cnpg-my-pg-pooler-rw
jdbc: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-pooler-rw:5432/test-db
hostRO: test-release-name-common-test-cnpg-my-pg-pooler-ro
jdbcRO: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-pooler-ro:5432/test-db
porthostRO: test-release-name-common-test-cnpg-my-pg-pooler-ro:5432
- documentIndex: *secretDoc
matchRegex:
path: stringData.std
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-rw:5432/test-db
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-pooler-rw:5432/test-db
- documentIndex: *secretDoc
matchRegex:
path: stringData.nossl
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-rw:5432/test-db\?sslmode=disable
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-pooler-rw:5432/test-db\?sslmode=disable
- documentIndex: *secretDoc
matchRegex:
path: stringData.stdRO
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-ro:5432/test-db
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-pooler-ro:5432/test-db
- documentIndex: *secretDoc
matchRegex:
path: stringData.nosslRO
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-ro:5432/test-db\?sslmode=disable
pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-pooler-ro:5432/test-db\?sslmode=disable
- it: should generate correct secret with password set
set:

20
library/common/templates/lib/cnpg/_dbCredentialSecrets.tpl
View File

@@ -14,21 +14,21 @@
{{- $jdbcTmpl := printf "jdbc:postgresql://%s-%%s:5432/%s" $objectData.name $objectData.database -}}
{{- $creds := (dict
"std" (printf $stdTmpl "rw")
"nossl" (printf $nosslTmpl "rw")
"portHost" (printf $portHostTmpl "rw")
"host" (printf $hostTmpl "rw")
"jdbc" (printf $jdbcTmpl "rw")
"std" (printf $stdTmpl "pooler-rw")
"nossl" (printf $nosslTmpl "pooler-rw")
"portHost" (printf $portHostTmpl "pooler-rw")
"host" (printf $hostTmpl "pooler-rw")
"jdbc" (printf $jdbcTmpl "pooler-rw")
) -}}
{{- $credsRO := dict -}}
{{- if $objectData.pooler.createRO -}}
{{- $credsRO = (dict
"std" (printf $stdTmpl "ro")
"nossl" (printf $nosslTmpl "ro")
"portHost" (printf $portHostTmpl "ro")
"host" (printf $hostTmpl "ro")
"jdbc" (printf $jdbcTmpl "ro")
"std" (printf $stdTmpl "pooler-ro")
"nossl" (printf $nosslTmpl "pooler-ro")
"portHost" (printf $portHostTmpl "pooler-ro")
"host" (printf $hostTmpl "pooler-ro")
"jdbc" (printf $jdbcTmpl "pooler-ro")
) -}}
{{- end -}}

8
library/common/templates/lib/dependencies/_dbWait.tpl
View File

@@ -368,15 +368,15 @@ command:
{{ $cnpgName = printf "%v-cnpg-%v" $cnpgName $name }}
echo "Detected RW pooler, testing RW pooler availability..."
until
echo "Testing database on url: {{ $cnpgName }}-rw"
pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-rw
echo "Testing database on url: {{ $cnpgName }}-pooler-rw"
pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-rw
do sleep 5
done
{{ if and $cnpg.pooler $cnpg.pooler.createRO }}
echo "Detected RO pooler, testing RO pooler availability..."
until
echo "Testing database on url: {{ $cnpgName }}-ro"
pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-ro
echo "Testing database on url: {{ $cnpgName }}-pooler-ro"
pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-ro
do sleep 5
done
{{ end }}