From 96d9b0d64f79b779536ca08703a3aa2b2dae716f Mon Sep 17 00:00:00 2001
From: Milan Gruner <milangruner@gmail.com>
Date: Mon, 11 Mar 2024 17:09:14 +0100
Subject: [PATCH] Add OPENCLIMATE_API_URL env var and use in API service

---
 app/src/services/api.ts |  5 +--
 k8s/cc-web-deploy.yml   | 72 +++++++++++++++++++++--------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/app/src/services/api.ts b/app/src/services/api.ts
index 5f3900276..e902ece3b 100644
--- a/app/src/services/api.ts
+++ b/app/src/services/api.ts
@@ -383,10 +383,7 @@ export const api = createApi({
 export const openclimateAPI = createApi({
   reducerPath: "openclimateapi",
   baseQuery: fetchBaseQuery({
-    baseUrl:
-      process.env.NODE_ENV === "production"
-        ? "https://app.openclimate.network"
-        : "https://openclimate.openearth.dev",
+    baseUrl: process.env.OPENCLIMATE_API_URL,
   }),
   endpoints: (builder) => ({
     getOCCity: builder.query<any, string>({
diff --git a/k8s/cc-web-deploy.yml b/k8s/cc-web-deploy.yml
index d4672efe4..20c5fdb37 100644
--- a/k8s/cc-web-deploy.yml
+++ b/k8s/cc-web-deploy.yml
@@ -15,38 +15,40 @@ spec:
         app: cc-web
     spec:
       containers:
-      - name: cc-web
-        image: ghcr.io/open-earth-foundation/citycatalyst:latest
-        # Set to Never for local
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 3000
-        env:
-        - name: NODE_ENV
-          value: "production"
-        - name: PORT
-          value: "3000"
-        - name: DATABASE_HOST
-          value: "cc-db"
-        - name: DATABASE_NAME
-          value: "citycatalyst"
-        - name: DATABASE_USER
-          value: "citycatalyst"
-        - name: DATABASE_PASSWORD
-          value: "development"
-        - name: NEXTAUTH_URL
-          value: "https://citycatalyst.openearth.dev"
-        - name: HOST
-          value: "https://citycatalyst.openearth.dev"
-        - name: SMTP_FROM_EMAIL
-          value: "citycatalyst@openearth.dev"
-        - name: SMTP_HOST
-          value: "email-smtp.us-east-1.amazonaws.com"
-        - name: SMTP_PORT
-          value: "587"
-        - name: GLOBAL_API_URL
-          value: "https://ccglobal.openearth.dev"
-        resources:
-          limits:
-            memory: "1024Mi"
-            cpu: "1000m"
+        - name: cc-web
+          image: ghcr.io/open-earth-foundation/citycatalyst:latest
+          # Set to Never for local
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 3000
+          env:
+            - name: NODE_ENV
+              value: "production"
+            - name: PORT
+              value: "3000"
+            - name: DATABASE_HOST
+              value: "cc-db"
+            - name: DATABASE_NAME
+              value: "citycatalyst"
+            - name: DATABASE_USER
+              value: "citycatalyst"
+            - name: DATABASE_PASSWORD
+              value: "development"
+            - name: NEXTAUTH_URL
+              value: "https://citycatalyst.openearth.dev"
+            - name: HOST
+              value: "https://citycatalyst.openearth.dev"
+            - name: SMTP_FROM_EMAIL
+              value: "citycatalyst@openearth.dev"
+            - name: SMTP_HOST
+              value: "email-smtp.us-east-1.amazonaws.com"
+            - name: SMTP_PORT
+              value: "587"
+            - name: GLOBAL_API_URL
+              value: "https://ccglobal.openearth.dev"
+            - name: OPENCLIMATE_API_URL
+              value: "https://openclimate.openearth.dev"
+          resources:
+            limits:
+              memory: "1024Mi"
+              cpu: "1000m"