From bcb6c9f2fe70422dd1c368b52bb922b1041b2471 Mon Sep 17 00:00:00 2001
From: Hayden Spitzley <hspitzley@chanzuckerberg.com>
Date: Thu, 20 Jun 2024 10:59:40 -0600
Subject: [PATCH] helm cant merge arrays

---
 .infra/common.yaml         | 13 -------------
 .infra/prod/values.yaml    | 12 ++++++++++++
 .infra/rdev/values.yaml    | 14 ++++++++++++--
 .infra/staging/values.yaml | 12 ++++++++++++
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.infra/common.yaml b/.infra/common.yaml
index 0e66b9e05..eaf015511 100644
--- a/.infra/common.yaml
+++ b/.infra/common.yaml
@@ -28,19 +28,6 @@ services:
       requests:
         cpu: 2
         memory: 2Gi
-    env:
-      - name: AWS_REGION
-        value: us-west-2
-      - name: AWS_DEFAULT_REGION
-        value: us-west-2
-      - name: REMOTE_DEV_PREFIX
-        value: /$(__ARGUS_STACK_NAME)
-      - name: DATA_LOCATOR_DOMAIN
-        value: api.$(__ARGUS_STACK_INGRESS_HOST)
-      - name: API_DOMAIN
-        value: api.$(__ARGUS_STACK_INGRESS_HOST)
-      - name: WEB_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
     ingress:
       hosts:
         - paths:
diff --git a/.infra/prod/values.yaml b/.infra/prod/values.yaml
index 82c4611b2..64fc30bea 100644
--- a/.infra/prod/values.yaml
+++ b/.infra/prod/values.yaml
@@ -11,6 +11,18 @@ services:
         cpu: 32
         memory: 24Gi
     env:
+      - name: AWS_REGION
+        value: us-west-2
+      - name: AWS_DEFAULT_REGION
+        value: us-west-2
+      - name: REMOTE_DEV_PREFIX
+        value: /$(__ARGUS_STACK_NAME)
+      - name: DATA_LOCATOR_DOMAIN
+        value: api.$(__ARGUS_STACK_INGRESS_HOST)
+      - name: API_DOMAIN
+        value: api.$(__ARGUS_STACK_INGRESS_HOST)
+      - name: WEB_DOMAIN
+        value: $(__ARGUS_STACK_INGRESS_HOST)
       - name: DEPLOYMENT_STAGE
         value: prod
       - name: CXG_BUCKET_PATH
diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml
index 053473658..d494a0a76 100644
--- a/.infra/rdev/values.yaml
+++ b/.infra/rdev/values.yaml
@@ -4,9 +4,19 @@ services:
       tag: sha-6a4bee02
     replicaCount: 1
     env:
+      - name: AWS_REGION
+        value: us-west-2
+      - name: AWS_DEFAULT_REGION
+        value: us-west-2
+      - name: REMOTE_DEV_PREFIX
+        value: /$(__ARGUS_STACK_NAME)
+      - name: DATA_LOCATOR_DOMAIN
+        value: api.$(__ARGUS_STACK_INGRESS_HOST)
+      - name: API_DOMAIN
+        value: $(__ARGUS_STACK_INGRESS_HOST)
+      - name: WEB_DOMAIN
+        value: $(__ARGUS_STACK_INGRESS_HOST)
       - name: DEPLOYMENT_STAGE
         value: rdev
       - name: CXG_BUCKET_PATH
         value: hosted-cellxgene-dev
-      - name: API_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
diff --git a/.infra/staging/values.yaml b/.infra/staging/values.yaml
index e2b2666d8..454f71d88 100644
--- a/.infra/staging/values.yaml
+++ b/.infra/staging/values.yaml
@@ -11,6 +11,18 @@ services:
         cpu: 2
         memory: 4Gi
     env:
+      - name: AWS_REGION
+        value: us-west-2
+      - name: AWS_DEFAULT_REGION
+        value: us-west-2
+      - name: REMOTE_DEV_PREFIX
+        value: /$(__ARGUS_STACK_NAME)
+      - name: DATA_LOCATOR_DOMAIN
+        value: api.$(__ARGUS_STACK_INGRESS_HOST)
+      - name: API_DOMAIN
+        value: api.$(__ARGUS_STACK_INGRESS_HOST)
+      - name: WEB_DOMAIN
+        value: $(__ARGUS_STACK_INGRESS_HOST)
       - name: DEPLOYMENT_STAGE
         value: staging
       - name: CXG_BUCKET_PATH