Merge pull request #369 from Open-Earth-Foundation/fix/use-open-earth…

…-dev Add OPENCLIMATE_API_URL env var and use in API service
Open-Earth-Foundation · Mar 14, 2024 · 3655ef7 · 3655ef7
2 parents 5fb2313 + 96d9b0d
commit 3655ef7
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 39 deletions.
diff --git 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
@@ -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: "[email protected]"
-        - 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: "[email protected]"
+            - 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"