Re: [PR] Fix metadata port in Keda connection when usePgbouncer is false [airflow]

[via GitHub]

hussein-awala commented on code in PR #34741:
URL: https://github.com/apache/airflow/pull/34741#discussion_r1349516585


##########
chart/templates/secrets/metadata-connection-secret.yaml:
##########
@@ -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 }}
+{{- $database := (ternary (printf "%s-%s" .Release.Name "metadata") 
$meadataDatabase .Values.pgbouncer.enabled) }}

Review Comment:
   ```suggestion
   {{- $database := (ternary (printf "%s-%s" .Release.Name "metadata") 
$metadataDatabase .Values.pgbouncer.enabled) }}
   ```



##########
chart/templates/secrets/metadata-connection-secret.yaml:
##########
@@ -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 }}

Review Comment:
   ```suggestion
   {{- $metadataDatabase := .Values.data.metadataConnection.db }}
   ```



##########
chart/templates/secrets/metadata-connection-secret.yaml:
##########
@@ -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 }}

Review Comment:
   ```suggestion
     kedaConnection: {{ urlJoin (dict "scheme" .protocol "userinfo" (printf 
"%s:%s" (.user | urlquery) (.pass | urlquery) ) "host" (printf "%s:%s" 
$metadataHost $metadataPort) "path" (printf "/%s" $metadataDatabase) "query" 
$query) | b64enc | quote }}
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@airflow.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org