helm cant merge arrays

chanzuckerberg · Jun 20, 2024 · bcb6c9f · bcb6c9f
1 parent f980d54
commit bcb6c9f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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