chore: update env vars and set up additional ingress rules (#1007)

chanzuckerberg · Jun 28, 2024 · 2a8bdd5 · 2a8bdd5
1 parent da25d12
commit 2a8bdd5
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 97 deletions.
diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -20,7 +20,7 @@ jobs:
           private_key: ${{ secrets.CZI_RELEASE_PLEASE_PK }}
 
       - name: release please
-        uses: google-github-actions/release-please-action@v4
+        uses: googleapis/release-please-action@v4
         id: release
         with:
           token: ${{ steps.generate_token.outputs.token }}
diff --git a/.infra/common.yaml b/.infra/common.yaml
@@ -29,7 +29,6 @@ services:
         cpu: 2
         memory: 2Gi
     ingress:
-      hosts:
-        - paths:
-            - path: /
-              pathType: Prefix
+      paths:
+        - path: /
+          pathType: Prefix
diff --git a/.infra/prod/Chart.yaml b/.infra/prod/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: stack
+type: application
+version: 1.0.0
+
+dependencies:
+- name: stack
+  version: 1.2.0
+  repository: https://chanzuckerberg.github.io/argo-helm-charts
diff --git a/.infra/prod/values.yaml b/.infra/prod/values.yaml
@@ -1,35 +1,36 @@
-services:
-  explorer:
-    serviceAccount:
-      annotations:
-        "eks.amazonaws.com/role-arn": arn:aws:iam::231426846575:role/data_portal_prod_explorer
-    image:
-      tag: sha-3883f979
-    replicaCount: 3
-    resources:
-      limits:
-        cpu: 64
-        memory: 50Gi
-      requests:
-        cpu: 32
-        memory: 24Gi
-    env:
-      # env vars common to all deployment stages
-      - name: AWS_REGION
-        value: us-west-2
-      - name: AWS_DEFAULT_REGION
-        value: us-west-2
-      - name: REMOTE_DEV_PREFIX
-        value: /$(__ARGUS_STACK_NAME)
-      - name: DEPLOYMENT_STAGE
-        value: $(__ARGUS_DEPLOYMENT_STAGE)
+stack:
+  services:
+    explorer:
+      serviceAccount:
+        annotations:
+          "eks.amazonaws.com/role-arn": arn:aws:iam::231426846575:role/data_portal_prod_explorer
+      image:
+        tag: sha-3883f979
+      replicaCount: 3
+      resources:
+        limits:
+          cpu: 64
+          memory: 50Gi
+        requests:
+          cpu: 32
+          memory: 24Gi
+      env:
+        # env vars common to all deployment stages
+        - name: AWS_REGION
+          value: us-west-2
+        - name: AWS_DEFAULT_REGION
+          value: us-west-2
+        - name: REMOTE_DEV_PREFIX
+          value: /$(__ARGUS_STACK_NAME)
+        - name: DEPLOYMENT_STAGE
+          value: $(__ARGUS_DEPLOYMENT_STAGE)
 
-      # env vars specific to this deployment stage
-      - name: WEB_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
-      - name: API_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
-      - name: DATA_LOCATOR_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
-      - name: CXG_BUCKET_PATH
-        value: hosted-cellxgene-$(__ARGUS_DEPLOYMENT_STAGE)
+        # env vars specific to this deployment stage
+        - name: WEB_DOMAIN
+          value: $(__ARGUS_STACK_INGRESS_HOST)
+        - name: API_DOMAIN
+          value: $(__ARGUS_STACK_INGRESS_HOST)
+        - name: DATA_LOCATOR_DOMAIN
+          value: $(__ARGUS_STACK_INGRESS_HOST)
+        - name: CXG_BUCKET_PATH
+          value: hosted-cellxgene-$(__ARGUS_DEPLOYMENT_STAGE)
diff --git a/.infra/rdev/Chart.yaml b/.infra/rdev/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: stack
+type: application
+version: 1.0.0
+
+dependencies:
+- name: stack
+  version: 1.2.0
+  repository: https://chanzuckerberg.github.io/argo-helm-charts
diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml
@@ -1,25 +1,29 @@
-services:
-  explorer:
-    image:
-      tag: sha-7764ea31
-    replicaCount: 1
-    env:
-      # env vars common to all deployment stages
-      - name: AWS_REGION
-        value: us-west-2
-      - name: AWS_DEFAULT_REGION
-        value: us-west-2
-      - name: REMOTE_DEV_PREFIX
-        value: /$(__ARGUS_STACK_NAME)
-      - name: DEPLOYMENT_STAGE
-        value: $(__ARGUS_DEPLOYMENT_STAGE)
+stack:
+  services:
+    explorer:
+      image:
+        tag: sha-7764ea31
+      replicaCount: 1
+      env:
+        # env vars common to all deployment stages
+        - name: AWS_REGION
+          value: us-west-2
+        - name: AWS_DEFAULT_REGION
+          value: us-west-2
+        - name: REMOTE_DEV_PREFIX
+          value: /$(__ARGUS_STACK_NAME)
+        - name: DEPLOYMENT_STAGE
+          value: $(__ARGUS_DEPLOYMENT_STAGE)
 
-      # env vars specific to this deployment stage
-      - name: WEB_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
-      - name: API_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
-      - name: DATA_LOCATOR_DOMAIN
-        value: $(__ARGUS_STACK_INGRESS_HOST)
-      - name: CXG_BUCKET_PATH
-        value: hosted-cellxgene-dev
+        # env vars specific to this deployment stage
+        - name: WEB_DOMAIN
+          value: $(__ARGUS_STACK_INGRESS_HOST)
+        - name: API_DOMAIN
+          value: $(__ARGUS_STACK_INGRESS_HOST)
+        - name: DATA_LOCATOR_DOMAIN
+          value: $(__ARGUS_STACK_INGRESS_HOST)
+        - name: CXG_BUCKET_PATH
+          value: hosted-cellxgene-dev
+      ingress:
+        rules:
+          - host: test.example.com
diff --git a/.infra/staging/Chart.yaml b/.infra/staging/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: stack
+type: application
+version: 1.0.0
+
+dependencies:
+- name: stack
+  version: 1.2.0
+  repository: https://chanzuckerberg.github.io/argo-helm-charts
diff --git a/.infra/staging/values.yaml b/.infra/staging/values.yaml
@@ -1,35 +1,40 @@
-services:
-  explorer:
-    serviceAccount:
-      annotations:
-        "eks.amazonaws.com/role-arn": arn:aws:iam::699936264352:role/data_portal_staging_explorer
-    image:
-      tag: sha-3883f979
-    replicaCount: 1
-    resources:
-      limits:
-        cpu: 4
-        memory: 14Gi
-      requests:
-        cpu: 2
-        memory: 4Gi
-    env:
-      # env vars common to all deployment stages
-      - name: AWS_REGION
-        value: us-west-2
-      - name: AWS_DEFAULT_REGION
-        value: us-west-2
-      - name: REMOTE_DEV_PREFIX
-        value: /$(__ARGUS_STACK_NAME)
-      - name: DEPLOYMENT_STAGE
-        value: $(__ARGUS_DEPLOYMENT_STAGE)
+stack:
+  services:
+    explorer:
+      serviceAccount:
+        annotations:
+          "eks.amazonaws.com/role-arn": arn:aws:iam::699936264352:role/data_portal_staging_explorer
+      image:
+        tag: sha-3883f979
+      replicaCount: 1
+      resources:
+        limits:
+          cpu: 4
+          memory: 14Gi
+        requests:
+          cpu: 2
+          memory: 4Gi
+      env:
+        # env vars common to all deployment stages
+        - name: AWS_REGION
+          value: us-west-2
+        - name: AWS_DEFAULT_REGION
+          value: us-west-2
+        - name: REMOTE_DEV_PREFIX
+          value: /$(__ARGUS_STACK_NAME)
+        - name: DEPLOYMENT_STAGE
+          value: $(__ARGUS_DEPLOYMENT_STAGE)
 
-      # env vars specific to this deployment stage
-      - name: WEB_DOMAIN
-        value: cellxgene.staging.single-cell.czi.technology
-      - name: API_DOMAIN
-        value: api.cellxgene.staging.single-cell.czi.technology
-      - name: DATA_LOCATOR_DOMAIN
-        value: api.cellxgene.staging.single-cell.czi.technology
-      - name: CXG_BUCKET_PATH
-        value: hosted-cellxgene-$(__ARGUS_DEPLOYMENT_STAGE)
+        # env vars specific to this deployment stage
+        - name: WEB_DOMAIN
+          value: cellxgene.staging.single-cell.czi.technology
+        - name: API_DOMAIN
+          value: api.cellxgene.staging.single-cell.czi.technology
+        - name: DATA_LOCATOR_DOMAIN
+          value: api.cellxgene.staging.single-cell.czi.technology
+        - name: CXG_BUCKET_PATH
+          value: hosted-cellxgene-$(__ARGUS_DEPLOYMENT_STAGE)
+      ingress:
+        rules:
+          - host: cellxgene.staging.single-cell.czi.technology
+          - host: api.cellxgene.staging.single-cell.czi.technology