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

DCJ-476: Bypass vault in actions #1671

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions .github/workflows/dev-image-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,19 @@ jobs:
ref: develop
token: ${{ secrets.BROADBOT_TOKEN }}
- name: 'Bump the tag to a new version'
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
id: bumperstep
with:
actions_subcommand: 'bumper'
role_id: ${{ secrets.ROLE_ID }}
secret_id: ${{ secrets.SECRET_ID }}
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
version_file_path: package.json
version_variable_name: version
GITHUB_TOKEN: ${{ secrets.BROADBOT_TOKEN }}
- name: 'Get gcp credentials'
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
with:
actions_subcommand: 'skip'
role_id: ${{ secrets.ROLE_ID }}
secret_id: ${{ secrets.SECRET_ID }}
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
- name: 'Pull down new tags'
run: git fetch --all --tags
- name: 'Get Previous tag'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helmtagbump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
with:
args: yq w -i datarepo-helm-definitions/integration/integration-6/datarepo-ui.yaml image.tag ${{ steps.uiprevioustag.outputs.tag }}"
- name: '[datarepo-helm-definitions] Merge chart version update'
uses: broadinstitute/datarepo-actions/actions/merger@0.73.0
uses: broadinstitute/datarepo-actions/actions/merger@0.74.0
env:
COMMIT_MESSAGE: 'Datarepo ui tag version update: ${{ steps.uiprevioustag.outputs.tag }}'
GITHUB_REPO: datarepo-helm-definitions
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
with:
args: yq w -i datarepo-helm/charts/datarepo-ui/Chart.yaml version ${{ steps.new_version.outputs.new_version }}"
- name: '[datarepo-helm] Merge chart version update'
uses: broadinstitute/datarepo-actions/actions/merger@0.73.0
uses: broadinstitute/datarepo-actions/actions/merger@0.74.0
env:
COMMIT_MESSAGE: 'Datarepo ui tag version update: ${{ steps.uiprevioustag.outputs.tag }}'
GITHUB_REPO: datarepo-helm
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- name: 'Whitelist Runner IP'
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
with:
actions_subcommand: 'gcp_whitelist'
role_id: ${{ secrets.ROLE_ID }}
secret_id: ${{ secrets.SECRET_ID }}
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
- name: 'Check for an available namespace to deploy API to and set state lock'
id: namespace
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
with:
actions_subcommand: 'k8_checknamespace'
# See https://github.com/DataBiosphere/jade-data-repo-ui/blob/develop/tools/ui_integration/README.md
# if setting up a new namespace for testing.
k8_namespaces: 'integration-4,integration-5'
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
- name: initialize npm
env:
DEV_PROJECT: broad-jade-dev
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
run: |
echo "Pushed docker image gcr.io/broad-jade-dev/jade-data-repo-ui:${GCR_TAG}"
- name: 'Deploy to cluster with Helm'
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
with:
actions_subcommand: 'helmdeploy'
helm_create_secret_manager_secret_version: 0.0.8
Expand All @@ -86,8 +86,9 @@ jobs:
helm_gcloud_sqlproxy_chart_version: 0.19.13
helm_oidc_proxy_chart_version: 0.0.44
helm_imagetag_update: 'ui'
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
- name: 'Wait for deployment to come back online'
uses: broadinstitute/datarepo-actions/actions/wait-for-deployment@0.73.0
uses: broadinstitute/datarepo-actions/actions/wait-for-deployment@0.74.0
env:
DEPLOYMENT_TYPE: 'ui'
- name: set cypresss env
Expand All @@ -105,14 +106,16 @@ jobs:
npx cypress run --record
- name: 'Clean state lock from used Namespace on API deploy'
if: always()
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
with:
actions_subcommand: 'k8_checknamespace_clean'
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
- name: 'Clean whitelisted Runner IP'
if: always()
uses: broadinstitute/datarepo-actions/actions/main@0.73.0
uses: broadinstitute/datarepo-actions/actions/main@0.74.0
with:
actions_subcommand: 'gcp_whitelist_clean'
sa_b64_credentials: ${{ secrets.SA_B64_CREDENTIALS }}
report-workflow:
uses: broadinstitute/sherlock/.github/workflows/client-report-workflow.yaml@main
if: ${{ github.ref == 'refs/heads/develop' }}
Expand Down
Loading