From 38e58ffc8cad192b8e82ce3edd24140a0ca55319 Mon Sep 17 00:00:00 2001 From: Denis Baryshev Date: Thu, 24 Jun 2021 12:41:31 +0300 Subject: [PATCH] update deployment workflows --- .github/workflows/deploy-apps.yml | 10 +++++----- .github/workflows/deploy-stage.yml | 28 ++++++++++++++++------------ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy-apps.yml b/.github/workflows/deploy-apps.yml index 364419e078..293f2fd941 100644 --- a/.github/workflows/deploy-apps.yml +++ b/.github/workflows/deploy-apps.yml @@ -29,22 +29,22 @@ jobs: { "mainnet": { "KUBECONF": "KUBECONF_MAINNET", - "HFENV": "zksync-prod", + "HFENV": "prod", "RUNNER": "mainnet" }, "rinkeby": { "KUBECONF": "KUBECONF_TESTNET", - "HFENV": "zksync-${{ github.event.deployment.environment }}", + "HFENV": "${{ github.event.deployment.environment }}", "RUNNER": "testnet" }, "ropsten": { "KUBECONF": "KUBECONF_TESTNET", - "HFENV": "zksync-${{ github.event.deployment.environment }}", + "HFENV": "${{ github.event.deployment.environment }}", "RUNNER": "testnet" }, ".*": { "KUBECONF": "KUBECONF_STAGE", - "HFENV": "zksync-${{ github.event.deployment.environment }}", + "HFENV": "${{ github.event.deployment.environment }}", "RUNNER": "stage" } } @@ -71,7 +71,7 @@ jobs: if: ${{ needs.pre.outputs.isTag == 'true' }} container: - image: dysnix/kubectl:v1.16-gcloud + image: dysnix/kubectl:v1.19-gcloud env: IMAGE_TAG: ${{ needs.pre.outputs.shortRev }} diff --git a/.github/workflows/deploy-stage.yml b/.github/workflows/deploy-stage.yml index c42b91c2e0..18910e9026 100644 --- a/.github/workflows/deploy-stage.yml +++ b/.github/workflows/deploy-stage.yml @@ -4,6 +4,7 @@ on: push: branches: - dev + - breaking env: DEPLOY_APPS: -l name=server -l name=prover -l name=explorer @@ -51,20 +52,24 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} zk docker push rust - zk docker push nginx deploy: + # TODO: fix stage and enable deployments back. + # NOTE: breaking deployment is not supported. + # if: ${{ github.ref == 'refs/heads/dev' }} + if: ${{ false }} + name: Deploy to the Stage enviroment runs-on: [k8s, deployer, stage] needs: [pre, build-images] container: - image: dysnix/kubectl:v1.16-gcloud + image: dysnix/kubectl:v1.19-gcloud env: KUBECONF: ${{ secrets.KUBECONF_STAGE }} IMAGE_TAG: ${{ needs.pre.outputs.shortRev }} - HFENV: zksync-stage + HFENV: stage steps: - @@ -85,16 +90,15 @@ jobs: with: token: "${{ github.token }}" environment: stage -# TODO fix stage and resume deploy to stage -# - -# name: Deploy apps -# working-directory: helm-infra -# run: | + - + name: Deploy apps + working-directory: helm-infra + run: | # copy helm plugins over (from dysnix/kubectl, don't forget)!!! -# cp -r /dysnix/kubectl/.local /dysnix/kubectl/.cache ~ -# -# UPDATE_REPOS=y helmfile -e $HFENV repos -# helmfile -e $HFENV $DEPLOY_APPS apply --args "timeout 180s" + cp -r /dysnix/kubectl/.local /dysnix/kubectl/.cache ~ + + UPDATE_REPOS=y helmfile -e $HFENV repos + helmfile -e $HFENV $DEPLOY_APPS apply --args "timeout 180s" - name: Update deployment status (success) if: success()