diff --git a/.infra/common.yaml b/.infra/common.yaml index 4602289de..eaf015511 100644 --- a/.infra/common.yaml +++ b/.infra/common.yaml @@ -28,23 +28,6 @@ services: requests: cpu: 2 memory: 2Gi - env: - - name: REMOTE_DEV_PREFIX - value: /explorer-devstack - - name: DEPLOYMENT_STAGE - value: dev - - name: DATA_LOCATOR_DOMAIN - value: api.cellxgene.dev.single-cell.czi.technology - - name: CXG_BUCKET_PATH - value: hosted-cellxgene-dev - - name: AWS_REGION - value: us-west-2 - - name: AWS_DEFAULT_REGION - value: us-west-2 - - name: API_DOMAIN - value: $(__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 138e31a5e..0f403038b 100644 --- a/.infra/prod/values.yaml +++ b/.infra/prod/values.yaml @@ -3,3 +3,30 @@ services: 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: DATA_LOCATOR_DOMAIN + value: api.$(__ARGUS_STACK_INGRESS_HOST) + - name: WEB_DOMAIN + value: $(__ARGUS_STACK_INGRESS_HOST) + + # env vars specific to this deployment stage + - name: DEPLOYMENT_STAGE + value: prod + - name: API_DOMAIN + value: api.$(__ARGUS_STACK_INGRESS_HOST) + - name: CXG_BUCKET_PATH + value: hosted-cellxgene-prod diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml index 33fd8c194..550a213e3 100644 --- a/.infra/rdev/values.yaml +++ b/.infra/rdev/values.yaml @@ -1,5 +1,25 @@ services: explorer: image: - tag: sha-a5b576b2 + tag: sha-4cfffeff 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: DATA_LOCATOR_DOMAIN + value: api.$(__ARGUS_STACK_INGRESS_HOST) + - name: WEB_DOMAIN + value: $(__ARGUS_STACK_INGRESS_HOST) + + # env vars specific to this deployment stage + - name: DEPLOYMENT_STAGE + value: rdev + - name: API_DOMAIN + value: $(__ARGUS_STACK_INGRESS_HOST) + - name: CXG_BUCKET_PATH + value: hosted-cellxgene-dev diff --git a/.infra/staging/values.yaml b/.infra/staging/values.yaml index 23bc241ef..5185dd6d8 100644 --- a/.infra/staging/values.yaml +++ b/.infra/staging/values.yaml @@ -3,3 +3,30 @@ services: 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: DATA_LOCATOR_DOMAIN + value: api.$(__ARGUS_STACK_INGRESS_HOST) + - name: WEB_DOMAIN + value: $(__ARGUS_STACK_INGRESS_HOST) + + # env vars specific to this deployment stage + - name: DEPLOYMENT_STAGE + value: staging + - name: API_DOMAIN + value: api.$(__ARGUS_STACK_INGRESS_HOST) + - name: CXG_BUCKET_PATH + value: hosted-cellxgene-staging diff --git a/server/ecs/app.py b/server/ecs/app.py index 0ba4c9161..0a0afa160 100644 --- a/server/ecs/app.py +++ b/server/ecs/app.py @@ -43,13 +43,15 @@ def _before_adding_routes(app, app_config): HUBSPOT_FORMS_URL = "https://forms.hsforms.com" + EXPLORER_DEV_URL = "https://cellxgene.dev.single-cell.czi.technology" + csp = { "default-src": ["'self'", HUBSPOT_FORMS_URL, HUBSPOT_JS_URL], "form-action": ["'self'", HUBSPOT_FORMS_URL], - "connect-src": ["'self'", PLAUSIBLE_URL, HUBSPOT_FORMS_URL] + extra_connect_src, + "connect-src": ["'self'", PLAUSIBLE_URL, HUBSPOT_FORMS_URL, EXPLORER_DEV_URL] + extra_connect_src, "script-src": ["'self'", "'unsafe-eval'", PLAUSIBLE_URL, HUBSPOT_FORMS_URL, HUBSPOT_JS_URL] + script_hashes, "style-src": ["'self'", "'unsafe-inline'"], - "img-src": ["'self'", "https://cellxgene.cziscience.com"] + "img-src": ["'self'", "https://cellxgene.cziscience.com", EXPLORER_DEV_URL] + extra_connect_src + ["data:", HUBSPOT_FORMS_URL], "object-src": ["'none'"],