Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update Argus values #997

Merged
merged 15 commits into from
Jun 20, 2024
Merged

chore: update Argus values #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ccd2f20
chore: update Argus values
hspitzley-czi Jun 20, 2024
f58879e
update resource requests
hspitzley-czi Jun 20, 2024
c48774d
rdev
hspitzley-czi Jun 20, 2024
61bad09
variable CXG_BUCKET_PATH
hspitzley-czi Jun 20, 2024
f980d54
api domain for rdev
hspitzley-czi Jun 20, 2024
bcb6c9f
helm cant merge arrays
hspitzley-czi Jun 20, 2024
0b4d6cc
try global env var overlay
hspitzley-czi Jun 20, 2024
01c9dd5
Revert "try global env var overlay"
hspitzley-czi Jun 20, 2024
5603d72
comments
hspitzley-czi Jun 20, 2024
3f3d0ad
chore: add deep zoom dev URL to CSP
tihuan Jun 20, 2024
865224e
chore: Updated [rdev] values.yaml image tags to sha-3f3d0adb
tihuan Jun 20, 2024
5466d2f
chore: add deep zoom dev URL to CSP
tihuan Jun 20, 2024
4cfffef
Merge branch 'main' into hspitzley/update_argus_configurations
tihuan Jun 20, 2024
0a80c4d
chore: Updated [rdev] values.yaml image tags to sha-4cfffeff
tihuan Jun 20, 2024
dfa8b05
Merge branch 'main' into hspitzley/update_argus_configurations
tihuan Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .infra/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
27 changes: 27 additions & 0 deletions .infra/prod/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 21 additions & 1 deletion .infra/rdev/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
27 changes: 27 additions & 0 deletions .infra/staging/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions server/ecs/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"],
Expand Down
Loading