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.

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

feat: setup explorer on argus #886

Merged
merged 86 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
99f99c2
feat: setup explorer on argus
jakeyheath Apr 17, 2024
2e1ea6a
pkg-config
jakeyheath Apr 17, 2024
c8e8f47
use pull through
jakeyheath Apr 17, 2024
a493e52
pull through?
jakeyheath Apr 17, 2024
4899639
linux amd64
jakeyheath Apr 17, 2024
97a717d
Merge branch 'main' into heathj/argus
jakeyheath Apr 17, 2024
69f96a0
nudge
jakeyheath Apr 17, 2024
4440fdb
Merge branch 'heathj/argus' of github.com:chanzuckerberg/single-cell-…
jakeyheath Apr 17, 2024
d8370dd
concurrency
jakeyheath Apr 17, 2024
6e19791
doc
jakeyheath Apr 17, 2024
e1d87ef
chore: Updated .infra/rdev/values.yaml image tags to sha-6e197918
jakeyheath Apr 17, 2024
1fef3a4
chore: Updated .infra/rdev/values.yaml image tags to sha-e1d87efb
czi-github-helper[bot] Apr 17, 2024
80e9fd6
chore: Updated .infra/rdev/values.yaml image tags to sha-1fef3a41
czi-github-helper[bot] Apr 17, 2024
13e58b1
chore: Updated .infra/rdev/values.yaml image tags to sha-80e9fd69
czi-github-helper[bot] Apr 17, 2024
ddb55e0
chore: Updated .infra/rdev/values.yaml image tags to sha-13e58b1e
czi-github-helper[bot] Apr 17, 2024
98a880e
chore: Updated .infra/rdev/values.yaml image tags to sha-ddb55e03
czi-github-helper[bot] Apr 17, 2024
c6b26b4
ignore infra repo
jakeyheath Apr 17, 2024
cf658ab
Merge branch 'heathj/argus' of github.com:chanzuckerberg/single-cell-…
jakeyheath Apr 17, 2024
16fc308
pin workflow
jakeyheath Apr 17, 2024
652d161
test
jakeyheath Apr 17, 2024
3e653a9
chore: Updated .infra/rdev/values.yaml image tags to sha-652d1618
jakeyheath Apr 17, 2024
12457a1
chore: configure stack management actions
hspitzley-czi Apr 17, 2024
d4f3c51
rename
hspitzley-czi Apr 17, 2024
feb1d74
fix filter
hspitzley-czi Apr 17, 2024
a757717
service account
jakeyheath Apr 17, 2024
44959d7
Merge branch 'heathj/argus' of github.com:chanzuckerberg/single-cell-…
jakeyheath Apr 17, 2024
eda4584
automount
jakeyheath Apr 17, 2024
eab1f22
explorer service name
jakeyheath Apr 17, 2024
d3bdd6b
Update .github/workflows/argus-delete-stack-rdev.yaml
hspitzley-czi Apr 18, 2024
d174bbd
architecture
jakeyheath Apr 18, 2024
59a4479
upgrade version to 0.7.0
hspitzley-czi Apr 18, 2024
168a4c8
Merge branch 'heathj/argus' into hspitzley/argus_stack_management
hspitzley-czi Apr 18, 2024
43be745
clunky
hspitzley-czi Apr 18, 2024
b2e9def
:facepalm:
hspitzley-czi Apr 18, 2024
9f09b41
health check path
hspitzley-czi Apr 18, 2024
547b8f3
use published actions
hspitzley-czi Apr 23, 2024
d2fdaa7
update images
jakeyheath Apr 24, 2024
97437f8
Merge branch 'heathj/argus' into hspitzley/argus_stack_management
jakeyheath Apr 24, 2024
d7a3a03
chore: configure stack management actions (#888)
jakeyheath Apr 24, 2024
2795a63
production pull through cache
jakeyheath Apr 24, 2024
d6ede1b
chore: Updated .infra/rdev/values.yaml image tags to sha-2795a639
jakeyheath Apr 24, 2024
b4c58b0
update argus actions
jakeyheath Apr 24, 2024
047983a
wrong port?
jakeyheath Apr 24, 2024
1b9db43
port again
jakeyheath Apr 24, 2024
a568eb4
resources
jakeyheath Apr 24, 2024
bbe6b0d
disbale autoscaling
jakeyheath Apr 24, 2024
729a1e1
add ingress
jakeyheath Apr 24, 2024
76c4aea
bump tiledb version
jakeyheath Apr 24, 2024
9882354
chore: Updated .infra/rdev/values.yaml image tags to sha-76c4aea8
jakeyheath Apr 24, 2024
ce09e0c
didn't work
jakeyheath Apr 25, 2024
53a3b5c
Merge branch 'heathj/argus' of github.com:chanzuckerberg/single-cell-…
jakeyheath Apr 25, 2024
163da59
chore: Updated .infra/rdev/values.yaml image tags to sha-53a3b5c5
jakeyheath Apr 25, 2024
2a3c4a2
feat: update cors policy
jakeyheath Apr 25, 2024
eb433a1
Merge branch 'heathj/argus' of github.com:chanzuckerberg/single-cell-…
jakeyheath Apr 25, 2024
9706cf9
chore: Updated .infra/rdev/values.yaml image tags to sha-eb433a1a
jakeyheath Apr 25, 2024
8c324d7
jk
jakeyheath Apr 25, 2024
fd90420
chore: Updated .infra/rdev/values.yaml image tags to sha-8c324d79
jakeyheath Apr 25, 2024
9dea9e4
Update values.yaml
jakeyheath Apr 30, 2024
85d8bc1
update actions
hspitzley-czi May 8, 2024
c3df851
use argus prod
hspitzley-czi May 30, 2024
6141618
rdev
hspitzley-czi May 30, 2024
9ab01dc
chore: Updated [rdev] values.yaml image tags to sha-61416180
hspitzley-czi May 30, 2024
a421b8d
chore: Updated [rdev] values.yaml image tags to sha-9ab01dcb
czi-github-helper[bot] May 30, 2024
32f38ba
chore: Updated [rdev] values.yaml image tags to sha-a421b8dc
czi-github-helper[bot] May 30, 2024
88e885e
simplify path_filters
hspitzley-czi May 30, 2024
075b871
chore: Updated [rdev] values.yaml image tags to sha-88e885e5
hspitzley-czi May 30, 2024
d9e7698
Merge remote-tracking branch 'origin/main' into heathj/argus
jakeyheath Jun 3, 2024
aa53292
Merge branch 'heathj/argus' of github.com:chanzuckerberg/single-cell-…
jakeyheath Jun 3, 2024
cef8f17
env vars
jakeyheath Jun 3, 2024
e93bbb3
namevalue
jakeyheath Jun 3, 2024
b12c649
update env vars
jakeyheath Jun 3, 2024
b38c3a6
update action to minimum allowed version
hspitzley-czi Jun 7, 2024
e521aee
chore: set up GH actions for staging & prod Argus stacks (#958)
hspitzley-czi Jun 7, 2024
9327702
chore: Updated [rdev] values.yaml image tags to sha-e521aee0
hspitzley-czi Jun 7, 2024
510c16b
Update .infra/common.yaml
hspitzley-czi Jun 7, 2024
611655c
try argocd env var
hspitzley-czi Jun 17, 2024
bbbcd79
Update .infra/common.yaml
hspitzley-czi Jun 17, 2024
8bbbf8d
try dependent env var
hspitzley-czi Jun 17, 2024
4300e0b
__ARGUS_STACK_INGRESS_HOST
hspitzley-czi Jun 17, 2024
f775590
Merge branch 'main' into heathj/argus
hspitzley-czi Jun 17, 2024
eedb138
chore: Updated [rdev] values.yaml image tags to sha-f775590d
hspitzley-czi Jun 17, 2024
b0ab424
update deps
hspitzley-czi Jun 18, 2024
1688085
Merge branch 'main' into heathj/argus
hspitzley-czi Jun 18, 2024
b5115d0
chore: Updated [rdev] values.yaml image tags to sha-1688085f
hspitzley-czi Jun 18, 2024
95abe1f
Merge branch 'main' into heathj/argus
hspitzley-czi Jun 20, 2024
c0128fa
chore: Updated [rdev] values.yaml image tags to sha-95abe1f7
hspitzley-czi 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
19 changes: 19 additions & 0 deletions .github/workflows/argus-stack-prod-upsert.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Update prod

on:
release:
types: [published]

jobs:
prod_stack_upsert:
runs-on: [ARM64, self-hosted, Linux]
permissions:
id-token: write
contents: read

steps:
- name: Upsert Prod Stack
uses: chanzuckerberg/argus-artifacts/ci/packages/[email protected]
hspitzley-czi marked this conversation as resolved.
Show resolved Hide resolved
with:
appName: single-cell-explorer
envName: prod
20 changes: 20 additions & 0 deletions .github/workflows/argus-stack-rdev-create.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Create an RDev Stack

on:
pull_request:
types: [ labeled, synchronize ]

jobs:
create-rdev-stack:
runs-on: [ARM64, self-hosted, Linux]
if: contains(github.event.pull_request.labels.*.name, 'stack')
permissions:
id-token: write
contents: read

steps:
- name: Create Stack
uses: chanzuckerberg/argus-artifacts/ci/packages/[email protected]
hspitzley-czi marked this conversation as resolved.
Show resolved Hide resolved
with:
appName: single-cell-explorer
envName: rdev
20 changes: 20 additions & 0 deletions .github/workflows/argus-stack-rdev-delete.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Delete an RDev Stack

on:
pull_request:
types: [ unlabeled, closed ]

jobs:
delete-rdev-stack:
runs-on: [ARM64, self-hosted, Linux]
if: ${{ !contains(github.event.pull_request.labels.*.name, 'stack') || github.event.pull_request.state == 'closed' }}
permissions:
id-token: write
contents: read

steps:
- name: Delete Stack
uses: chanzuckerberg/argus-artifacts/ci/packages/[email protected]
hspitzley-czi marked this conversation as resolved.
Show resolved Hide resolved
with:
appName: single-cell-explorer
envName: rdev
28 changes: 28 additions & 0 deletions .github/workflows/argus-stack-staging-upsert.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Update staging

on:
pull_request:
paths:
- '.infra/common.yaml'
- '.infra/staging/values.yaml'

jobs:
run_if:
if: github.head_ref == 'release-please--branches--main'
runs-on: [ARM64, self-hosted, Linux]
steps:
- run: echo "The head branch of this PR is the release please branch"

staging_stack_upsert:
needs: run_if
runs-on: [ARM64, self-hosted, Linux]
permissions:
id-token: write
contents: read

steps:
- name: Upsert Staging Stack
uses: chanzuckerberg/argus-artifacts/ci/packages/[email protected]
hspitzley-czi marked this conversation as resolved.
Show resolved Hide resolved
with:
appName: single-cell-explorer
envName: staging
13 changes: 13 additions & 0 deletions .github/workflows/docker-build-rdev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Docker Image Build - rdev

on:
- push

jobs:
rdev_argus_builder:
uses: ./.github/workflows/workflow-argus-docker-build.yaml
secrets: inherit
with:
envs: rdev
path_filters: '!.infra/**'
branches_ignore: main,release-please--branches--main
13 changes: 13 additions & 0 deletions .github/workflows/docker-build-staging-prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Docker Image Build - staging/prod

on:
- push

jobs:
argus_builder:
uses: ./.github/workflows/workflow-argus-docker-build.yaml
secrets: inherit
with:
envs: staging,prod
path_filters: '!.infra/**'
branches: release-please--branches--main
26 changes: 26 additions & 0 deletions .github/workflows/release-please.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
name: release-please
jobs:
release-please:
runs-on: [ARM64, self-hosted, Linux]
steps:
# See https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow
# For why we need to generate a token and not use the default
- name: Generate token
id: generate_token
uses: chanzuckerberg/[email protected]
with:
app_id: ${{ secrets.CZI_RELEASE_PLEASE_APP_ID }}
private_key: ${{ secrets.CZI_RELEASE_PLEASE_PK }}

- name: release please
uses: google-github-actions/release-please-action@v4
id: release
with:
token: ${{ steps.generate_token.outputs.token }}
42 changes: 42 additions & 0 deletions .github/workflows/workflow-argus-docker-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Docker Image Build

on:
workflow_call:
inputs:
envs:
description: 'Env names, comma delimited'
required: true
type: string
path_filters:
description: 'Glob patterns to match against changed files in the repository, comma delimited'
required: true
type: string
branches:
description: 'Branches to build on, comma delimited'
required: false
type: string
default: '*'
branches_ignore:
description: 'Branches to skip build on, comma delimited'
required: false
type: string
default: ''

jobs:
argus_builder:
uses: chanzuckerberg/github-actions/.github/workflows/[email protected]
secrets: inherit
with:
branches: ${{ inputs.branches }}
branches_ignore: ${{ inputs.branches_ignore }}
path_filters: ${{ inputs.path_filters }}
envs: ${{ inputs.envs }}
images: |
[
{
"name": "explorer",
"context": ".",
"dockerfile": "hosted/Dockerfile",
"platform": "linux/amd64"
}
]
52 changes: 52 additions & 0 deletions .infra/common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
global:
replicaCount: 1
autoscaling:
enabled: false
service:
port: 5000
nodeSelector:
kubernetes.io/arch: amd64
livenessProbe:
httpGet:
path: /cellxgene/health
readinessProbe:
httpGet:
path: /cellxgene/health
services:
explorer:
serviceAccount:
create: true
automount: true
annotations:
"eks.amazonaws.com/role-arn": arn:aws:iam::699936264352:role/data_portal_dev_explorer
image:
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/single-cell-explorer/explorer
resources:
limits:
cpu: 4
memory: 4Gi
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: $ARGOCD_APP_NAME.dev-sc.dev.czi.team # TODO: be able to swap out stack name?
- name: WEB_DOMAIN
value: $ARGOCD_APP_NAME.dev-sc.dev.czi.team # TODO: be able to swap out stack name?
hspitzley-czi marked this conversation as resolved.
Show resolved Hide resolved
ingress:
hosts:
- paths:
- path: /
pathType: Prefix
5 changes: 5 additions & 0 deletions .infra/prod/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
explorer:
image:
tag: sha-3883f979
replicaCount: 3
5 changes: 5 additions & 0 deletions .infra/rdev/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
explorer:
image:
tag: sha-e521aee0
replicaCount: 1
5 changes: 5 additions & 0 deletions .infra/staging/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
explorer:
image:
tag: sha-3883f979
replicaCount: 1
2 changes: 2 additions & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
2 changes: 1 addition & 1 deletion hosted/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM 533267185808.dkr.ecr.us-west-2.amazonaws.com/docker.io/sci/library/ubuntu:22.04

ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
Expand Down
25 changes: 25 additions & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"release-type": "simple",
"pull-request-title-pattern": "chore${scope}: release${component} ${version}",
"bump-minor-pre-major": true,
"changelog-sections": [
{
"type": "feat",
"section": "Features",
"hidden": false
},
{
"type": "fix",
"section": "Bug Fixes",
"hidden": false
},
{
"type": "chore",
"section": "Misc",
"hidden": false
}
],
"packages": {
".": {}
}
}
Loading