From 9727e920896d0f05cf7e3fa3dad7f336e6a9b951 Mon Sep 17 00:00:00 2001
From: Kyryl Skobylko <xpuska513@gmail.com>
Date: Wed, 10 Aug 2022 15:54:44 +0300
Subject: [PATCH] fix: fix gcs-log creds secret name, add externaldb
 configuration for temporal, fix webapp ingress

---
 charts/airbyte-temporal/templates/deployment.yaml  | 5 ++++-
 charts/airbyte-webapp/templates/ingress.yaml       | 4 ++--
 charts/airbyte/templates/gcs-log-creds-secret.yaml | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml
index ff2120146a8e..f74699092d87 100644
--- a/charts/airbyte-temporal/templates/deployment.yaml
+++ b/charts/airbyte-temporal/templates/deployment.yaml
@@ -61,7 +61,10 @@ spec:
                 name: {{ .Values.global.database.secretName | default (printf "%s-postgresql" .Release.Name ) }}
                 key: {{ .Values.global.database.secretValue | default "postgresql-password" }}
           - name: POSTGRES_SEEDS
-            value: {{ .Release.Name }}-postgresql
+            valueFrom:
+              configMapKeyRef:
+                name: {{ .Values.global.configMapName | default (printf "%s-airbyte-env" .Release.Name) }}
+                key: DATABASE_HOST
           - name: DYNAMIC_CONFIG_FILE_PATH
             value: "config/dynamicconfig/development.yaml"
         {{- end }}
diff --git a/charts/airbyte-webapp/templates/ingress.yaml b/charts/airbyte-webapp/templates/ingress.yaml
index 2c0f29ecdb04..785333a8a77c 100644
--- a/charts/airbyte-webapp/templates/ingress.yaml
+++ b/charts/airbyte-webapp/templates/ingress.yaml
@@ -54,11 +54,11 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}-webapp
+                name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}-webapp
+              serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
diff --git a/charts/airbyte/templates/gcs-log-creds-secret.yaml b/charts/airbyte/templates/gcs-log-creds-secret.yaml
index fd494d52acbe..4848f4c20f5e 100644
--- a/charts/airbyte/templates/gcs-log-creds-secret.yaml
+++ b/charts/airbyte/templates/gcs-log-creds-secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.names.fullname" . }}-gcs-log-creds
+  name: {{ .Release.Name }}-gcs-log-creds
 type: Opaque
 data:
   gcp.json: "{{ .Values.global.logs.gcs.credentialsJson }}"