From 6854776e4e08fdeefb6251904ff3a3fa4ce5da5c Mon Sep 17 00:00:00 2001
From: Maxime Naulleau <9624579+Nmaxime@users.noreply.github.com>
Date: Mon, 13 Dec 2021 14:55:17 +0100
Subject: [PATCH] Add google cloud storage configuration in helm chart (#8332)

* Add google cloud storage configuration in helm chart

* Fix GCS naming convention in helm chart

* Fix setting GCS_LOG_BUCKET in helm env-configmap

* Add quotes to gcs values in helm env-configmap

* Remove unnecessary 'default ' in helm env-configmap
---
 charts/airbyte/Chart.lock                   | 8 ++++----
 charts/airbyte/templates/env-configmap.yaml | 4 ++--
 charts/airbyte/values.yaml                  | 7 +++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/charts/airbyte/Chart.lock b/charts/airbyte/Chart.lock
index 41a4b375a04a3..d5ae2c8e7d1a3 100644
--- a/charts/airbyte/Chart.lock
+++ b/charts/airbyte/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 1.10.0
+  version: 1.10.1
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.12.2
+  version: 10.13.9
 - name: minio
   repository: https://charts.bitnami.com/bitnami
   version: 7.3.2
-digest: sha256:5f89ca9a82db41bcb9dce50e95a2abcafebce71b51be99760a670be30a3ec5c6
-generated: "2021-10-08T12:41:40.511486438-05:00"
+digest: sha256:51711092d4fb978667aaeadac5080241db1eb32d4a0d4d25c2a775110d013813
+generated: "2021-11-30T11:54:53.849182827+01:00"
diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml
index ee553f1ef94ef..27d703401e4e8 100644
--- a/charts/airbyte/templates/env-configmap.yaml
+++ b/charts/airbyte/templates/env-configmap.yaml
@@ -17,8 +17,8 @@ data:
   DATABASE_USER: {{ include "airbyte.database.user" . }}
   DB_DOCKER_MOUNT: airbyte_db
   FULLSTORY: {{ ternary "enabled" "disabled" .Values.webapp.fullstory.enabled }}
-  GCS_LOG_BUCKET: ""
-  GOOGLE_APPLICATION_CREDENTIALS: ""
+  GCS_LOG_BUCKET: {{ .Values.logs.gcs.bucket | quote }}
+  GOOGLE_APPLICATION_CREDENTIALS: {{ .Values.logs.gcs.credentials | quote }}
   INTERNAL_API_HOST: {{ include "common.names.fullname" . }}-server:{{ .Values.server.service.port }}
   IS_DEMO: {{ ternary "true" "false" .Values.webapp.isDemo | quote }}
   JOB_POD_MAIN_CONTAINER_CPU_LIMIT: ""
diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
index cffedb4aae93e..ca467eb7e43e2 100644
--- a/charts/airbyte/values.yaml
+++ b/charts/airbyte/values.yaml
@@ -542,3 +542,10 @@ logs:
     enabled: false
     bucket: airbyte-dev-logs
     bucketRegion: ""
+ 
+  ## Google Cloud Storage (GCS) Log Location Configuration
+  ## @param gcs.bucket GCS bucket name
+  ## @param gcs.credentials The path the GCS creds are written to
+  gcs:
+    bucket: ""
+    credentials: ""