From 581b27335ff64626b8ca68500fd8118c055a679a Mon Sep 17 00:00:00 2001
From: Jared Rhizor <jared@dataline.io>
Date: Wed, 26 May 2021 13:57:34 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=89=20=20allow=20users=20to=20access?=
 =?UTF-8?q?=20both=20the=20api=20and=20webapp=20from=20the=20same=20port?=
 =?UTF-8?q?=20(#3603)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* single port v2

* fix upstream location

* add kube support

* fix .env.dev

* set INTERNAL_API_HOST for kube
---
 .env                                       | 1 +
 .env.dev                                   | 1 +
 airbyte-webapp/nginx/default.conf.template | 8 ++++++++
 docker-compose.yaml                        | 1 +
 kube/overlays/dev/.env                     | 1 +
 kube/overlays/stable/.env                  | 1 +
 kube/resources/webapp.yaml                 | 5 +++++
 7 files changed, 18 insertions(+)

diff --git a/.env b/.env
index 355665dfe5034..673038a3e4a95 100644
--- a/.env
+++ b/.env
@@ -21,3 +21,4 @@ WEBAPP_URL=http://localhost:8000/
 # todo - Migrate to a way to define a better default API_URL
 # API_URL=http://localhost:8001/api/v1/
 TEMPORAL_HOST=airbyte-temporal:7233
+INTERNAL_API_HOST=airbyte-server:8001
diff --git a/.env.dev b/.env.dev
index a4f8fb38145c4..97ba48d560908 100644
--- a/.env.dev
+++ b/.env.dev
@@ -19,3 +19,4 @@ TRACKING_STRATEGY=logging
 HACK_LOCAL_ROOT_PARENT=/tmp
 WEBAPP_URL=http://localhost:8000/
 API_URL=http://localhost:8001/api/v1/
+INTERNAL_API_HOST=airbyte-server:8001
diff --git a/airbyte-webapp/nginx/default.conf.template b/airbyte-webapp/nginx/default.conf.template
index 64ae7e7c299b5..ec6307bb23a1b 100644
--- a/airbyte-webapp/nginx/default.conf.template
+++ b/airbyte-webapp/nginx/default.conf.template
@@ -1,3 +1,7 @@
+upstream api-server {
+    server $INTERNAL_API_HOST;
+}
+
 server {
     listen       80;
     listen  [::]:80;
@@ -29,4 +33,8 @@ server {
     location = /50x.html {
         root   /usr/share/nginx/html;
     }
+
+    location /api/ {
+        proxy_pass http://api-server/api/;
+    }
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d4e8abf029330..13ed6a283d0ed 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -90,6 +90,7 @@ services:
       - IS_DEMO=${IS_DEMO:-}
       - PAPERCUPS_STORYTIME=${PAPERCUPS_STORYTIME:-}
       - TRACKING_STRATEGY=${TRACKING_STRATEGY}
+      - INTERNAL_API_HOST=${INTERNAL_API_HOST}
   airbyte-temporal:
     image: temporalio/auto-setup:1.7.0
     container_name: airbyte-temporal
diff --git a/kube/overlays/dev/.env b/kube/overlays/dev/.env
index a27e24449ccf1..1d0ee122b2298 100644
--- a/kube/overlays/dev/.env
+++ b/kube/overlays/dev/.env
@@ -16,3 +16,4 @@ LOCAL_ROOT=/tmp/airbyte_local
 PAPERCUPS_STORYTIME=disabled
 IS_DEMO=false
 TEMPORAL_HOST=airbyte-temporal-svc:7233
+INTERNAL_API_HOST=http://airbyte-server-svc:8001/api/
diff --git a/kube/overlays/stable/.env b/kube/overlays/stable/.env
index 7c280ca796b21..d6e46cb6ab38a 100644
--- a/kube/overlays/stable/.env
+++ b/kube/overlays/stable/.env
@@ -16,3 +16,4 @@ LOCAL_ROOT=/tmp/airbyte_local
 PAPERCUPS_STORYTIME=enabled
 IS_DEMO=false
 TEMPORAL_HOST=airbyte-temporal-svc:7233
+INTERNAL_API_HOST=http://airbyte-server-svc:8001/api/
diff --git a/kube/resources/webapp.yaml b/kube/resources/webapp.yaml
index 101effed70ac6..ad780cb248ad7 100644
--- a/kube/resources/webapp.yaml
+++ b/kube/resources/webapp.yaml
@@ -53,5 +53,10 @@ spec:
                 configMapKeyRef:
                   name: airbyte-env
                   key: IS_DEMO
+            - name: INTERNAL_API_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: airbyte-env
+                  key: INTERNAL_API_HOST
           ports:
             - containerPort: 80