Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix metadata DB & port in Keda connection when usePgbouncer is false #34741

Merged
merged 3 commits into from
Oct 7, 2023
Merged

Fix metadata DB & port in Keda connection when usePgbouncer is false #34741

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c7cb3
Fix metadata port in Keda connection when usePgbouncer is false
hussein-awala Oct 3, 2023
d5ba30f
load the correct database name
hussein-awala Oct 4, 2023
85aaf91
Fix a typo
hussein-awala Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions chart/templates/secrets/metadata-connection-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
{{- $metadataHost := .Values.data.metadataConnection.host | default $defaultMetadataHost }}
{{- $pgbouncerHost := (printf "%s-%s.%s" .Release.Name "pgbouncer" .Release.Namespace) }}
{{- $host := ternary $pgbouncerHost $metadataHost .Values.pgbouncer.enabled }}
{{- $port := ((ternary .Values.ports.pgbouncer .Values.data.metadataConnection.port .Values.pgbouncer.enabled) | toString) }}
{{- $database := (ternary (printf "%s-%s" .Release.Name "metadata") .Values.data.metadataConnection.db .Values.pgbouncer.enabled) }}
{{- $metadataPort := .Values.data.metadataConnection.port | toString }}
{{- $port := ((ternary .Values.ports.pgbouncer $metadataPort .Values.pgbouncer.enabled) | toString) }}
{{- $meadataDatabase := .Values.data.metadataConnection.db }}
hussein-awala marked this conversation as resolved.
Show resolved Hide resolved
{{- $database := (ternary (printf "%s-%s" .Release.Name "metadata") $meadataDatabase .Values.pgbouncer.enabled) }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo nit. $meadataDatabase -> metadataDatabase

hussein-awala marked this conversation as resolved.
Show resolved Hide resolved
{{- $query := ternary (printf "sslmode=%s" .Values.data.metadataConnection.sslmode) "" (eq .Values.data.metadataConnection.protocol "postgresql") }}
apiVersion: v1
kind: Secret
Expand All @@ -47,7 +49,7 @@ data:
{{- end }}
{{- if and .Values.workers.keda.enabled .Values.pgbouncer.enabled (not .Values.workers.keda.usePgbouncer) }}
{{- with .Values.data.metadataConnection }}
kedaConnection: {{ urlJoin (dict "scheme" .protocol "userinfo" (printf "%s:%s" (.user | urlquery) (.pass | urlquery) ) "host" (printf "%s:%s" $metadataHost $port) "path" (printf "/%s" $database) "query" $query) | b64enc | quote }}
kedaConnection: {{ urlJoin (dict "scheme" .protocol "userinfo" (printf "%s:%s" (.user | urlquery) (.pass | urlquery) ) "host" (printf "%s:%s" $metadataHost $metadataPort) "path" (printf "/%s" $meadataDatabase) "query" $query) | b64enc | quote }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo nit meadataDatabase -> metadataDatabase

hussein-awala marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
{{- end }}
{{- end }}
10 changes: 8 additions & 2 deletions helm_tests/other/test_keda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,16 @@ def test_default_keda_db_connection_pgbouncer_enabled_usePgbouncer_false(self):
assert "KEDA_DB_CONN" in worker_container_env_vars

secret_data = jmespath.search("data", metadata_connection_secret)
connection_secret = base64.b64decode(secret_data["connection"]).decode()
keda_connection_secret = base64.b64decode(secret_data["kedaConnection"]).decode()
assert "connection" in secret_data.keys()
assert "@release-name-pgbouncer" in base64.b64decode(secret_data["connection"]).decode()
assert "@release-name-pgbouncer" in connection_secret
assert ":6543" in connection_secret
assert "/release-name-metadata" in connection_secret
assert "kedaConnection" in secret_data.keys()
assert "@release-name-postgresql" in base64.b64decode(secret_data["kedaConnection"]).decode()
assert "@release-name-postgresql" in keda_connection_secret
assert ":5432" in keda_connection_secret
assert "/postgres" in keda_connection_secret

autoscaler_connection_env_var = jmespath.search(
"spec.triggers[0].metadata.connectionFromEnv", keda_autoscaler
Expand Down